Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig

https://bugs.webkit.org/show_bug.cgi?id=136765

Reviewed by Alexey Proskuryakov.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index dd48986804b0495f2916fbe5632ae7074f8641a2..65495c5400fd5f1fcba5156b2d58efd229ee3539 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2015-01-27  Filip Pizlo  <fpizlo@apple.com>
 
         ExitSiteData saying m_takesSlowPath shouldn't mean early returning takesSlowPath() since for the non-LLInt case we later set m_couldTakeSlowPath, which is more precise

diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig
index d184ce9531333d8424163df8297c16629fb8c2ac..1c6411f59e19fde73793ae3b5de10d95bc55d7d6 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Base.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Base.xcconfig
@@ -143,3 +143,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig b/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
index f7a4d5def9872381c60cebb4ac3f29330406154d..aa8225697984c5b7ff52315c7109049668de4576 100644 (file)
--- a/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
+++ b/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
@@ -36,10 +36,6 @@ MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
 SDKROOT_macosx_ = macosx;

diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index c5f8e1675566572a1430ab114cad4a82bcbd6167..19892551dc3b17e5d03f9c63bc396718291cfbba 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2014-12-26  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain

diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
index a8c03982c69be69ca7a31a31254342e7832e1069..a101a9c4d680dcf9e833ceb41dd6960fab48c216 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
@@ -58,3 +58,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig b/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
index df34a20f1ac4d1f98975c0806342626635845b73..047e84ecb1dbc9ce4787e2ee63766058428f4f1a 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
@@ -12,8 +12,6 @@ MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index c5ad4ad8fa69d1bbc8a64cf84754024523722249..ab6af89ee165fa8b13806320103582d5f137fad8 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2015-01-28  Darin Adler  <darin@apple.com>
 
         Fix small leak in Collator

diff --git a/Source/WTF/Configurations/Base.xcconfig b/Source/WTF/Configurations/Base.xcconfig
index 6dc930d0f33e492ad6d55d54f4c9888fcd8d051a..f5848623aba40e0137e2a3a47cf8f62f7b2194ee 100644 (file)
--- a/Source/WTF/Configurations/Base.xcconfig
+++ b/Source/WTF/Configurations/Base.xcconfig
@@ -120,3 +120,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/WTF/Configurations/DebugRelease.xcconfig b/Source/WTF/Configurations/DebugRelease.xcconfig
index 0fb8259bade2be8b061938aca1b846b9886d1132..f5295352841f76282c2e223d682f4fd96c08d250 100644 (file)
--- a/Source/WTF/Configurations/DebugRelease.xcconfig
+++ b/Source/WTF/Configurations/DebugRelease.xcconfig
@@ -34,8 +34,6 @@ MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 07fbab6c6e9daa536ee274aabd3c29c447ff7b24..725565b0858119ef8934f5cf26b78388b395bbad 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2015-01-28  Chris Dumez  <cdumez@apple.com>
 
         Use an enum class for createFontFamilyValue()'s fromSystemFontID argument

diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig
index 75cfb5e4ec5b0be39ad566fa604ec3211114d9b0..06bf86db61ee2cf513891cd7b705d7832f9d394c 100644 (file)
--- a/Source/WebCore/Configurations/Base.xcconfig
+++ b/Source/WebCore/Configurations/Base.xcconfig
@@ -117,3 +117,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/WebCore/Configurations/DebugRelease.xcconfig b/Source/WebCore/Configurations/DebugRelease.xcconfig
index 86333d59f790dbc188fc10d4514e6573b7331160..431ff38afde2f2380599d7b43cbc43c3164bb406 100644 (file)
--- a/Source/WebCore/Configurations/DebugRelease.xcconfig
+++ b/Source/WebCore/Configurations/DebugRelease.xcconfig
@@ -39,10 +39,6 @@ DEBUG_INFORMATION_FORMAT = dwarf;
 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default;
 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default;
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
 SDKROOT_macosx_ = macosx;

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 1978ca18e63c9431c29bb0a719e666f531999253..303a75b2ce63408492e4bafc0a2a8ea65f290295 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -30362,7 +30362,7 @@
                        buildSettings = {
                                EXPORTED_SYMBOLS_FILE = "";
                                INSTALL_PATH = /usr/local/bin;
-                               OTHER_LDFLAGS = "";
+                               OTHER_LDFLAGS = "$(ASAN_OTHER_LDFLAGS)";
                                PRODUCT_NAME = WebCoreExportFileGenerator;
                                SKIP_INSTALL = YES;
                        };

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index 2748c180bef6cfba18531a2c950d9227a1646fde..61e24b940de7a6a9466a37a530198a1c598a0faf 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2015-01-23  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Object Previews in the Console

diff --git a/Source/WebInspectorUI/Configurations/Base.xcconfig b/Source/WebInspectorUI/Configurations/Base.xcconfig
index 81515c639c9623beac345978b927bcd1d4627761..49e70f692adac9707202f54fff60272a4b9da732 100644 (file)
--- a/Source/WebInspectorUI/Configurations/Base.xcconfig
+++ b/Source/WebInspectorUI/Configurations/Base.xcconfig
@@ -66,3 +66,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig b/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
index 46e6d61d484d7c5f9c8171cef6778e5fc5d22b5c..0ccc7155973d8131f4c9a5ebafc03ac34185611b 100644 (file)
--- a/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
+++ b/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
@@ -15,10 +15,6 @@ ENGINEERING_BUILD = 1;
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
 SDKROOT_macosx_ = macosx;

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 5a96ed94753a8be0e44f1bfd62227103980aac22..e8c2bba4d889417fbb0a387c79e0d30a36e17841 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2015-01-28  Chris Dumez  <cdumez@apple.com>
 
         Fix typo in markPagesForVistedLinkStyleRecalc()

diff --git a/Source/WebKit/mac/Configurations/Base.xcconfig b/Source/WebKit/mac/Configurations/Base.xcconfig
index fa8d0885bc030200f3fc869afb097c43d197eda6..4e430bf18e926cc7e62129e61f87bd3e86743969 100644 (file)
--- a/Source/WebKit/mac/Configurations/Base.xcconfig
+++ b/Source/WebKit/mac/Configurations/Base.xcconfig
@@ -108,3 +108,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
index 3e3978a56d5427540df7662deb8844ce8d3d2b1c..e1f06a919970c3561a029e9fb00200c99e9051d8 100644 (file)
--- a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
@@ -44,10 +44,6 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
 SDKROOT_macosx_ = macosx;

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index eca6848477919983854c0e98b91819a938d46870..b86781a5ce42b1a4e15790e18cab80ef979165de 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2015-01-28  Chris Dumez  <cdumez@apple.com>
 
         Fix typo in markPagesForVistedLinkStyleRecalc()

diff --git a/Source/WebKit2/Configurations/Base.xcconfig b/Source/WebKit2/Configurations/Base.xcconfig
index b831e043a308ccbfcd4e1e9fa4a605c7d07b50fc..e42691219ce832bd41f5f062469b3ab04e47c011 100644 (file)
--- a/Source/WebKit2/Configurations/Base.xcconfig
+++ b/Source/WebKit2/Configurations/Base.xcconfig
@@ -79,7 +79,6 @@ WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-securit
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
-
 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
 // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
 DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK;
@@ -115,3 +114,7 @@ TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
 
 FRAMEWORK_CONTENT_DIRECTORY[sdk=macosx*] = Versions/A;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/WebKit2/Configurations/DebugRelease.xcconfig b/Source/WebKit2/Configurations/DebugRelease.xcconfig
index 94369927bf846b70a1001a94b1c1d5dae8aa4e93..fd8611f6bbb9465844bb26c261508bc75900508c 100644 (file)
--- a/Source/WebKit2/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit2/Configurations/DebugRelease.xcconfig
@@ -44,10 +44,6 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
 
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
-
 DEBUG_OR_RELEASE = YES;
 
 SDKROOT[sdk=iphone*] = $(SDKROOT);

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index c9f2e5f56b2f5bb2f430efed7bf5e686cf050372..90e1a4d45b12777b54e8456e7a477523ce9d421d 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,13 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2015-01-21  Geoffrey Garen  <ggaren@apple.com>
 
         bmalloc: support aligned allocation

diff --git a/Source/bmalloc/Configurations/Base.xcconfig b/Source/bmalloc/Configurations/Base.xcconfig
index 5e4959a6e008b59cd4bd3e33a77cacabce1e91cd..7c06c6b1a339f697075ee6f4c04fa3c0704a6c2b 100644 (file)
--- a/Source/bmalloc/Configurations/Base.xcconfig
+++ b/Source/bmalloc/Configurations/Base.xcconfig
@@ -115,3 +115,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Source/bmalloc/Configurations/DebugRelease.xcconfig b/Source/bmalloc/Configurations/DebugRelease.xcconfig
index 0fb8259bade2be8b061938aca1b846b9886d1132..f5295352841f76282c2e223d682f4fd96c08d250 100644 (file)
--- a/Source/bmalloc/Configurations/DebugRelease.xcconfig
+++ b/Source/bmalloc/Configurations/DebugRelease.xcconfig
@@ -34,8 +34,6 @@ MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 
 SDKROOT[sdk=iphone*] = $(SDKROOT);
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index a54d63a5c39889b4a9297f881149726b65db8de6..63530f10e51f044e89bc6cc6b6bdc41b621a9873 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2015-01-28  Dana Burkart  <dburkart@apple.com>
+
+        Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=136765
+
+        Reviewed by Alexey Proskuryakov.
+
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+        * LayoutTestRelay/Configurations/Base.xcconfig:
+        * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
+        * MiniBrowser/Configurations/Base.xcconfig:
+        * MiniBrowser/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+        * WebKitLauncher/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
 2015-01-28  Joanmarie Diggs  <jdiggs@igalia.com>
 
         AX: [ATK] Implement support for new AtkRole types for MathML

diff --git a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
index c7f3d503c1408c67b6f72a0f1e65a3cb2e9a6e74..525a283adac9d6f2d9cfa0799a1e55cfc4b2cc0a 100644 (file)
--- a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
+++ b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
@@ -1215,7 +1215,6 @@
                                COPY_PHASE_STRIP = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               OTHER_CFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = All;
                                SECTORDER_FLAGS = "";
@@ -1233,7 +1232,6 @@
                                COPY_PHASE_STRIP = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               OTHER_CFLAGS = "";
                                OTHER_REZFLAGS = "";
                                PRODUCT_NAME = All;
                                SECTORDER_FLAGS = "";

diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
index a184d8588e0533a68f3e9f8004143ab366c9c233..154a957f26ab1bf80820cf07b55070248dca723e 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
@@ -59,7 +59,6 @@ DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
-
 SDKROOT = macosx.internal;
 
 WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
@@ -74,3 +73,7 @@ TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
 
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
index d82a4b2d3b3b5db3b57c204e87749283a0042b92..f15cea68aa58af901ecf958afd987f8f681e815f 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
@@ -45,9 +45,6 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
 
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
 SDKROOT_iphoneos = $(SDKROOT);

diff --git a/Tools/LayoutTestRelay/Configurations/Base.xcconfig b/Tools/LayoutTestRelay/Configurations/Base.xcconfig
index eaa2a48c9d30999d72e9e19f46e8633aeb8812d1..5663c233e0d4eddb3fdcf9576950018cb294a56d 100644 (file)
--- a/Tools/LayoutTestRelay/Configurations/Base.xcconfig
+++ b/Tools/LayoutTestRelay/Configurations/Base.xcconfig
@@ -61,3 +61,7 @@ TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
 
 SUPPORTED_PLATFORMS = macosx;
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
\ No newline at end of file

diff --git a/Tools/MiniBrowser/Configurations/Base.xcconfig b/Tools/MiniBrowser/Configurations/Base.xcconfig
index 238032a477907fb8d4884584205e8c3f19c1cbfb..85fe7d13f921168a2cb7b56b9a0741cf0ef15c0b 100644 (file)
--- a/Tools/MiniBrowser/Configurations/Base.xcconfig
+++ b/Tools/MiniBrowser/Configurations/Base.xcconfig
@@ -60,3 +60,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig b/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
index 3191e2460d61f467a2d1ba114fce5d25e1a937ce..1ef94e3d807f8d480a98d6ee8bedcfcd40edb821 100644 (file)
--- a/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
+++ b/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
@@ -36,10 +36,6 @@ MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
 SDKROOT_iphoneos = $(SDKROOT);
 SDKROOT_iphonesimulator = $(SDKROOT);

diff --git a/Tools/TestWebKitAPI/Configurations/Base.xcconfig b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
index e3c982cbe9c863e04e7cc69d847de9ceb9adee9a..65491475e6c0a58ea84e0c703d27351c5666f433 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/Base.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
@@ -75,3 +75,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

diff --git a/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig b/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
index f1e37baf9d95f28ebddeba937dfa0182e38c43b8..ce1cff63c438c7707024b205d0745cad54806420 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
@@ -36,13 +36,11 @@ MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 
 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
 
-OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = -ftemplate-depth=256 $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
 SDKROOT_iphoneos = $(SDKROOT);
 SDKROOT_iphonesimulator = $(SDKROOT);
 SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
 SDKROOT_macosx_ = macosx;
 SDKROOT_macosx_YES = macosx.internal;
+
+OTHER_CPLUSPLUSFLAGS = $(inherited) -ftemplate-depth=256;

diff --git a/Tools/WebKitLauncher/Configurations/Base.xcconfig b/Tools/WebKitLauncher/Configurations/Base.xcconfig
index 4a9b51c4af9bc0e1de02549afaf0a85f5fd506fe..c115cf139093dff1e85f2470ff85f5b81120dd38 100644 (file)
--- a/Tools/WebKitLauncher/Configurations/Base.xcconfig
+++ b/Tools/WebKitLauncher/Configurations/Base.xcconfig
@@ -36,10 +36,6 @@ WARNING_CFLAGS = -Wall;
 
 ENABLE_SPARKLE = 0;
 
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
-
 TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
 TOOLCHAINS_iphoneos = $(TOOLCHAINS);
 TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
@@ -48,3 +44,7 @@ TOOLCHAINS_macosx_1080 = default;
 TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
+
+OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
\ No newline at end of file

diff --git a/Tools/WebKitTestRunner/Configurations/Base.xcconfig b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
index 54704a4bfa5af33e5fdb3b614287009526a4fd2d..0466517c187ceaf8e047cb6b7d3daac550c305a4 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/Base.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
@@ -69,4 +69,8 @@ TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
 TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
 TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
 
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
 SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;

diff --git a/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig b/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
index cc5fc76521d41f199470f7efb68c9efe2a14ada3..1391ae5fb484584d37d35c9d373008f361dec638 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
@@ -45,10 +45,6 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
 
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
-
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
 SDKROOT_iphoneos = $(SDKROOT);
 SDKROOT_iphonesimulator = $(SDKROOT);