Build against the Xcode default toolchain when targeting OS X 10.8.

This fixes the build after r156632 in configurations that use another toolchain
by default.

* gtest/xcode/Config/General.xcconfig:

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

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 085015614407571debc56fb525e20efccce26fc7..73cac5785e0e7955a2f28783619f4a167f1db2ec 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-06  Dan Bernstein  <mitz@apple.com>
+
+        Build against the Xcode default toolchain when targeting OS X 10.8.
+
+        This fixes the build after r156632 in configurations that use another toolchain
+        by default.
+
+        * gtest/xcode/Config/General.xcconfig:
+
 2013-10-06  Darin Adler  <darin@apple.com>
 
         Remove unneeded ScriptGCEvent class

diff --git a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
index 74b6822f46ec353840f047fc6176ad277982e708..f3ea8348d0f0c5dc184f87b42f733e1666ff877e 100644 (file)
--- a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
+++ b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
@@ -66,3 +66,8 @@ GTEST_VERSIONINFO_ABOUT =  © 2008 Google Inc.
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+TOOLCHAINS = $(TOOLCHAINS_$(MAC_OS_X_VERSION_MAJOR));
+TOOLCHAINS_1070 = $(TOOLCHAINS);
+TOOLCHAINS_1080 = default;
+TOOLCHAINS_1090 = $(TOOLCHAINS);