REGRESSION: WebKitLegacy causes ASan build to fail

<rdar://problem/16344326>

Patch by David Farler <dfarler@apple.com> on 2014-03-17
Reviewed by David Kilzer.

* Configurations/DebugRelease.xcconfig: Remove $(inherited) from
OTHER_CFLAGS, OTHER_CPLUSPLUSFLAGS, OTHER_LDFLAGS to prevent
double complete ASAN flags.

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

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index d854cc44d81105ea654cb71f9e9c3587e14e711e..f9683ca1e4bdbbda7fbf8f481978778433278de8 100644 (file)
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-17  David Farler  <dfarler@apple.com>
+
+        REGRESSION: WebKitLegacy causes ASan build to fail
+        <rdar://problem/16344326>
+
+        Reviewed by David Kilzer.
+
+        * Configurations/DebugRelease.xcconfig: Remove $(inherited) from
+        OTHER_CFLAGS, OTHER_CPLUSPLUSFLAGS, OTHER_LDFLAGS to prevent
+        double complete ASAN flags.
+
 2014-03-16  Brent Fulgham  <bfulgham@apple.com>
 
         Provide preference to enable additional AVFoundation options

diff --git a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
index 8dba1322933f709b85f8db621cda23a6b8d753c3..912c489b647906fd5c68d9528704c89cabd6c2cd 100644 (file)
--- a/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit/mac/Configurations/DebugRelease.xcconfig
@@ -48,9 +48,9 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
 WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090);
 
-OTHER_CFLAGS = $(inherited) $(ASAN_OTHER_CFLAGS);
-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ASAN_OTHER_CPLUSPLUSFLAGS);
-OTHER_LDFLAGS = $(inherited) $(ASAN_OTHER_LDFLAGS);
+OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
 
 SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
 SDKROOT_iphoneos = $(SDKROOT);