Title: [163894] trunk/Tools
- Revision
- 163894
- Author
- ddkil...@apple.com
- Date
- 2014-02-11 12:12:30 -0800 (Tue, 11 Feb 2014)
Log Message
[ASan] Fix build failures in Tools due to missing $(inherited) values
<http://webkit.org/b/128485>
Reviewed by Dean Jackson.
* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
- Move $(inherited) from OTHER_LDFLAGS_macosx to OTHER_LDFLAGS.
* DumpRenderTree/mac/Configurations/ImageDiff.xcconfig:
* DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
- Add $(inherited) to OTHER_LDFLAGS.
* WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
* WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
- Add $(inherited) to OTHER_LDFLAGS, or move from
OTHER_LDFLAGS_BASE to OTHER_LDFLAGS.
- Extract $(OTHER_LDFLAGS_BASE) from platform-specific settings
into OTHER_LDFLAGS.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (163893 => 163894)
--- trunk/Tools/ChangeLog 2014-02-11 19:49:52 UTC (rev 163893)
+++ trunk/Tools/ChangeLog 2014-02-11 20:12:30 UTC (rev 163894)
@@ -1,3 +1,24 @@
+2014-02-11 David Kilzer <ddkil...@apple.com>
+
+ [ASan] Fix build failures in Tools due to missing $(inherited) values
+ <http://webkit.org/b/128485>
+
+ Reviewed by Dean Jackson.
+
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ - Move $(inherited) from OTHER_LDFLAGS_macosx to OTHER_LDFLAGS.
+
+ * DumpRenderTree/mac/Configurations/ImageDiff.xcconfig:
+ * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
+ - Add $(inherited) to OTHER_LDFLAGS.
+
+ * WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
+ * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
+ - Add $(inherited) to OTHER_LDFLAGS, or move from
+ OTHER_LDFLAGS_BASE to OTHER_LDFLAGS.
+ - Extract $(OTHER_LDFLAGS_BASE) from platform-specific settings
+ into OTHER_LDFLAGS.
+
2014-02-11 James Craig <jcr...@apple.com>
Web Inspector: AX: Accessibility Node Inspection
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (163893 => 163894)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-02-11 19:49:52 UTC (rev 163893)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2014-02-11 20:12:30 UTC (rev 163894)
@@ -23,8 +23,8 @@
#include "BaseTarget.xcconfig"
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework _javascript_Core -framework OpenGL -framework WebKit;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework _javascript_Core -framework OpenGL -framework WebKit;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
PRODUCT_NAME = DumpRenderTree;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig (163893 => 163894)
--- trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig 2014-02-11 19:49:52 UTC (rev 163893)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig 2014-02-11 20:12:30 UTC (rev 163894)
@@ -24,7 +24,7 @@
#include "BaseTarget.xcconfig"
PRODUCT_NAME = ImageDiff;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework QuartzCore;
OTHER_LDFLAGS_iphoneos = -framework CoreFoundation -framework CoreGraphics -framework MobileCoreServices -framework ImageIO;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (163893 => 163894)
--- trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2014-02-11 19:49:52 UTC (rev 163893)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2014-02-11 20:12:30 UTC (rev 163894)
@@ -25,5 +25,5 @@
#include "BaseTarget.xcconfig"
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig (163893 => 163894)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2014-02-11 19:49:52 UTC (rev 163893)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2014-02-11 20:12:30 UTC (rev 163894)
@@ -29,11 +29,11 @@
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
SKIP_INSTALL = NO;
-OTHER_LDFLAGS_BASE = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework QuartzCore;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework UIKit;
+OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework QuartzCore;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework UIKit;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -framework Carbon -framework Cocoa;
+OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
EXCLUDED_SOURCE_FILE_NAMES_iphoneos = AccessibilityControllerMac.mm AccessibilityTextMarkerMac.mm AccessibilityUIElementMac.mm ActivateFonts.mm InjectedBundleMac.mm InjectedBundlePageMac.mm WebArchiveDumpSupportMac.mm;
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (163893 => 163894)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2014-02-11 19:49:52 UTC (rev 163893)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2014-02-11 20:12:30 UTC (rev 163894)
@@ -27,10 +27,10 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES
OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework WebKit2;
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework _javascript_Core -framework CoreGraphics -framework ImageIO -framework UIKit;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_iphoneos = -framework _javascript_Core -framework CoreGraphics -framework ImageIO -framework UIKit;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -framework Carbon -framework Cocoa;
+OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
SKIP_INSTALL = NO;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
