Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (177745 => 177746)
--- trunk/Source/_javascript_Core/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-22 Mark Lam <[email protected]>
Use ctiPatchCallByReturnAddress() in JITOperations.cpp.
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -137,8 +137,8 @@
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
HAVE_DTRACE = 1;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (177745 => 177746)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-24 Dan Bernstein <[email protected]>
ANGLE extern symbols are not hidden by default, but should be
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -52,8 +52,8 @@
SDKROOT = macosx.internal;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Source/ThirdParty/ChangeLog (177745 => 177746)
--- trunk/Source/ThirdParty/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/ThirdParty/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * gtest/xcode/Config/General.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-09 David Kilzer <[email protected]>
Switch from using PLATFORM_NAME to SDK selectors in ANGLE, bmalloc, gtest, _javascript_Core, WTF
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (177745 => 177746)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -67,8 +67,8 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_1090);
Modified: trunk/Source/WTF/ChangeLog (177745 => 177746)
--- trunk/Source/WTF/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WTF/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-25 Dan Bernstein <[email protected]>
Try to fix the Windows build after r177733.
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -114,8 +114,8 @@
SDKROOT = macosx.internal;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Source/WebCore/ChangeLog (177745 => 177746)
--- trunk/Source/WebCore/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebCore/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-25 Dhi Aurrahman <[email protected]>
Allow strings as argument to :lang()
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -111,8 +111,8 @@
SDKROOT = macosx.internal;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Source/WebInspectorUI/ChangeLog (177745 => 177746)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-20 David Kilzer <[email protected]>
Switch from using PLATFORM_NAME to SDK selectors in WebCore, WebInspectorUI, WebKit, WebKit2
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -60,8 +60,8 @@
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Source/WebKit/mac/ChangeLog (177745 => 177746)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-23 Timothy Horton <[email protected]>
Install a TextIndicator for link immediate actions
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -102,8 +102,8 @@
SUPPORTED_PLATFORMS = iphonesimulator iphoneos macosx;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Source/WebKit2/ChangeLog (177745 => 177746)
--- trunk/Source/WebKit2/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-25 Hunseop Jeong <[email protected]>
Fix build warning after r177700
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -105,8 +105,8 @@
CODE_SIGN_IDENTITY = -;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Source/bmalloc/ChangeLog (177745 => 177746)
--- trunk/Source/bmalloc/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/bmalloc/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * Configurations/Base.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-15 Geoffrey Garen <[email protected]>
Safari crashes when you set Malloc environment variables
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (177745 => 177746)
--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -109,8 +109,8 @@
SDKROOT = macosx.internal;
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
Modified: trunk/Tools/ChangeLog (177745 => 177746)
--- trunk/Tools/ChangeLog 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Tools/ChangeLog 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,3 +1,13 @@
+2014-12-26 Dan Bernstein <[email protected]>
+
+ <rdar://problem/19348208> REGRESSION (r177027): iOS builds use the wrong toolchain
+ https://bugs.webkit.org/show_bug.cgi?id=139950
+
+ Reviewed by David Kilzer.
+
+ * asan/asan.xcconfig: Only define TOOLCHAINS when building for OS X, doing so
+ in a manner that works with Xcode 5.1.1.
+
2014-12-24 Dan Bernstein <[email protected]>
Engineering builds of MiniBrowser ignore deprecated declaration warnings
Modified: trunk/Tools/asan/asan.xcconfig (177745 => 177746)
--- trunk/Tools/asan/asan.xcconfig 2014-12-26 07:34:39 UTC (rev 177745)
+++ trunk/Tools/asan/asan.xcconfig 2014-12-26 15:45:44 UTC (rev 177746)
@@ -1,5 +1,5 @@
-TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS[sdk=macosx*] = $(TOOLCHAINS_macosx);
+TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
TOOLCHAINS_macosx_1080 = default;
TOOLCHAINS_macosx_1090 = default;
TOOLCHAINS_macosx_101000 = default;
