Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (209433 => 209434)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-12-06 Saam Barati <[email protected]>
Remove old Wasm object model
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -38,7 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (209433 => 209434)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-10-30 Michael Catanzaro <[email protected]>
-Wpragmas warning spam from angleutils.h
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -15,7 +15,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Source/ThirdParty/ChangeLog (209433 => 209434)
--- trunk/Source/ThirdParty/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/ThirdParty/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,16 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * gtest/xcode/Config/DebugProject.xcconfig:
+ * gtest/xcode/Config/ReleaseProject.xcconfig:
+
2016-09-28 Konstantin Tokarev <[email protected]>
Unreviewed, woff2 upgrade introduces compiler warnings
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig (209433 => 209434)
--- trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -34,7 +34,6 @@
_ONLY_ACTIVE_ARCH_ = YES
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig (209433 => 209434)
--- trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -36,7 +36,6 @@
_ONLY_ACTIVE_ARCH_ = YES
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Source/WTF/ChangeLog (209433 => 209434)
--- trunk/Source/WTF/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WTF/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-12-06 Michael Saboff <[email protected]>
REGRESSION(r209399): Causes crashes when dumping JIT disassembly
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -37,7 +37,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Source/WebCore/ChangeLog (209433 => 209434)
--- trunk/Source/WebCore/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebCore/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-12-06 Saam Barati <[email protected]>
Remove old Wasm object model
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -41,7 +41,6 @@
CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default;
CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default;
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Source/WebInspectorUI/ChangeLog (209433 => 209434)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-12-05 Matt Baker <[email protected]>
Web Inspector: Object.shallowEqual([{}], [{}]) should return true
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -17,10 +17,9 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
COMBINE_INSPECTOR_RESOURCES = NO;
COMBINE_TEST_RESOURCES = YES;
Modified: trunk/Source/WebKit/mac/ChangeLog (209433 => 209434)
--- trunk/Source/WebKit/mac/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-12-05 Simon Fraser <[email protected]>
Improve the behavior of scroll-into-view when the target is inside position:fixed
Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -46,7 +46,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Source/WebKit2/ChangeLog (209433 => 209434)
--- trunk/Source/WebKit2/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-12-06 Andreas Kling <[email protected]>
[Cocoa] Add some memory usage related information to sysdiagnose state dumps
Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -46,10 +46,9 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_XPC_SERVICE_SUFFIX[sdk=macosx*] = .Development;
Modified: trunk/Source/bmalloc/ChangeLog (209433 => 209434)
--- trunk/Source/bmalloc/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/bmalloc/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,15 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2016-11-29 Andy Estes <[email protected]>
[Cocoa] Enable two clang warnings recommended by Xcode
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -37,7 +37,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/ChangeLog (209433 => 209434)
--- trunk/Tools/ChangeLog 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Tools/ChangeLog 2016-12-07 00:34:49 UTC (rev 209434)
@@ -1,3 +1,20 @@
+2016-12-06 Alexey Proskuryakov <[email protected]>
+
+ Correct SDKROOT values in xcconfig files
+ https://bugs.webkit.org/show_bug.cgi?id=165487
+ rdar://problem/29539209
+
+ Reviewed by Dan Bernstein.
+
+ Fix suggested by Dan Bernstein.
+
+ * ContentExtensionTester/Configurations/DebugRelease.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * WebEditingTester/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
2016-12-06 Daniel Bates <[email protected]>
WebKitTestRunner: Plugins are disabled in new windows
Modified: trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -36,7 +36,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -43,7 +43,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -37,9 +37,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
-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;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -37,9 +37,8 @@
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
OTHER_CPLUSPLUSFLAGS = $(inherited) -ftemplate-depth=256;
Modified: trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -37,9 +37,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
-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;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (209433 => 209434)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-12-07 00:27:58 UTC (rev 209433)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-12-07 00:34:49 UTC (rev 209434)
@@ -43,7 +43,6 @@
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = WebKitSystemInterfaceOSX10.12;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101300 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200);
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
+SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
+SDKROOT_ = macosx;
+SDKROOT_YES = macosx.internal;
