Diff
Modified: trunk/Source/WebKit/ChangeLog (222896 => 222897)
--- trunk/Source/WebKit/ChangeLog 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKit/ChangeLog 2017-10-05 05:46:49 UTC (rev 222897)
@@ -1,5 +1,15 @@
2017-10-04 Alex Christensen <[email protected]>
+ Stop linking with WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=177915
+
+ Reviewed by Antti Koivisto.
+
+ * Configurations/DebugRelease.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
+2017-10-04 Alex Christensen <[email protected]>
+
Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=177912
Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (222896 => 222897)
--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -38,14 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (222896 => 222897)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2017-10-05 05:46:49 UTC (rev 222897)
@@ -11034,7 +11034,6 @@
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
PRODUCT_NAME = PluginProcessShim;
};
@@ -11046,7 +11045,6 @@
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
PRODUCT_NAME = PluginProcessShim;
};
@@ -11058,7 +11056,6 @@
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-lWebKitSystemInterface",
);
PRODUCT_NAME = PluginProcessShim;
};
@@ -11070,7 +11067,6 @@
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
};
name = Debug;
@@ -11081,7 +11077,6 @@
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
};
name = Release;
@@ -11168,7 +11163,6 @@
buildSettings = {
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-lWebKitSystemInterface",
);
};
name = Production;
Modified: trunk/Source/WebKitLegacy/ChangeLog (222896 => 222897)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-10-05 05:46:49 UTC (rev 222897)
@@ -1,3 +1,12 @@
+2017-10-04 Alex Christensen <[email protected]>
+
+ Stop linking with WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=177915
+
+ Reviewed by Antti Koivisto.
+
+ * WebKitLegacy.xcodeproj/project.pbxproj:
+
2017-10-02 Per Arne Vollan <[email protected]>
[Win] Link error: cannot open file 'WebKitGUID.lib'
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (222896 => 222897)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2017-10-05 05:46:49 UTC (rev 222897)
@@ -3711,7 +3711,6 @@
DEBUG_DEFINES = "$(DEBUG_DEFINES_debug) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
};
name = Debug;
@@ -3723,7 +3722,6 @@
DEBUG_DEFINES = "$(DEBUG_DEFINES_$(CURRENT_VARIANT)) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)",
);
};
name = Release;
@@ -3735,7 +3733,6 @@
BUILD_VARIANTS = normal;
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
- "-lWebKitSystemInterface",
);
};
name = Production;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (222896 => 222897)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-05 05:46:49 UTC (rev 222897)
@@ -1,5 +1,15 @@
2017-10-04 Alex Christensen <[email protected]>
+ Stop linking with WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=177915
+
+ Reviewed by Antti Koivisto.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
+2017-10-04 Alex Christensen <[email protected]>
+
Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=177912
Modified: trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (222896 => 222897)
--- trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -38,14 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (222896 => 222897)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -52,7 +52,7 @@
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) U_HIDE_DEPRECATED_API U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 FRAMEWORK_NAME=WebKitLegacy $(inherited);
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
-HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
INFOPLIST_FILE = mac/Info.plist;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
@@ -100,13 +100,6 @@
WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering[sdk=iphonesimulator*] = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-
WK_EMPTY_ = YES;
WK_NOT_ = YES;
WK_NOT_YES = NO;
Modified: trunk/Tools/ChangeLog (222896 => 222897)
--- trunk/Tools/ChangeLog 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/ChangeLog 2017-10-05 05:46:49 UTC (rev 222897)
@@ -1,5 +1,22 @@
2017-10-04 Alex Christensen <[email protected]>
+ Stop linking with WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=177915
+
+ Reviewed by Antti Koivisto.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
+ * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
+ * WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig:
+
+2017-10-04 Alex Christensen <[email protected]>
+
Remove unnecessary includes of WebKitSystemInterface on Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=177912
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (222896 => 222897)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -102,8 +102,6 @@
WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
-
AD_HOC_CODE_SIGNING_ALLOWED = YES;
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (222896 => 222897)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -35,14 +35,6 @@
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (222896 => 222897)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -25,7 +25,7 @@
OTHER_LDFLAGS = $(inherited) $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);
PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -framework _javascript_Core;
-PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework _javascript_Core -framework OpenGL -framework QuartzCore -framework WebKit;
+PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework _javascript_Core -framework OpenGL -framework QuartzCore -framework WebKit;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
PRODUCT_NAME = DumpRenderTree;
SKIP_INSTALL[sdk=macosx*] = NO;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig (222896 => 222897)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -28,7 +28,7 @@
OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA FWFTTF fonts/FontWithFeatures.ttf -sectcreate __DATA FWFOTF fonts/FontWithFeatures.otf;
OTHER_LDFLAGS = $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);
-PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework _javascript_Core -framework WebKit $(OTHER_LDFLAGS_FONTS);
+PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework _javascript_Core -framework WebKit $(OTHER_LDFLAGS_FONTS);
PLATFORM_OTHER_LDFLAGS[sdk=macosx*] = -framework _javascript_Core;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (222896 => 222897)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -92,8 +92,6 @@
FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
-
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (222896 => 222897)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -35,14 +35,6 @@
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(WK_TARGET_IOS_VERSION_MAJOR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = WebKitSystemInterfaceElCapitan;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101400 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300);
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig (222896 => 222897)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -30,7 +30,7 @@
SKIP_INSTALL = NO;
-OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework CoreText -framework QuartzCore;
+OTHER_LDFLAGS_BASE = -framework CoreText -framework QuartzCore;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework UIKit;
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Carbon -framework Cocoa;
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (222896 => 222897)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -29,7 +29,7 @@
PRODUCT_NAME = WebKitTestRunner;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework _javascript_Core -framework WebKit;
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework _javascript_Core -framework WebKit;
SKIP_INSTALL[sdk=iphone*] = YES;
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/*;
INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/main.mm;
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig (222896 => 222897)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig 2017-10-05 04:30:40 UTC (rev 222896)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig 2017-10-05 05:46:49 UTC (rev 222897)
@@ -30,7 +30,7 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -lWebCoreTestSupport -framework _javascript_Core -framework CoreGraphics -framework QuartzCore -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation;
+OTHER_LDFLAGS = $(inherited) -lWebKitTestRunner -lWebCoreTestSupport -framework _javascript_Core -framework CoreGraphics -framework QuartzCore -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation;
SKIP_INSTALL[sdk=macosx*] = YES;
