Changeset 43691 in webkit for trunk/JavaScriptCore/Configurations

Timestamp:

May 14, 2009, 4:14:43 AM (16 years ago)

Author:

[email protected]

Message:

<rdar://problem/6681868> When building with Xcode 3.1.3 should be using gcc 4.2

Rubber-stamped by Darin Adler.

The meaning of XCODE_VERSION_ACTUAL is more sensible in newer versions of Xcode.
Update our logic to select the compiler version to use the more appropriate XCODE_VERSION_MINOR
if the version of Xcode supports it, and fall back to XCODE_VERSION_ACTUAL if not.

File:

• trunk/JavaScriptCore/Configurations/Base.xcconfig (modified) (1 diff)

trunk/JavaScriptCore/Configurations/Base.xcconfig

@@ -83 +83 @@
 SECTORDER_FLAGS = -sectorder __TEXT __text JavaScriptCore.order;
 
-GCC_VERSION = $(GCC_VERSION_$(XCODE_VERSION_ACTUAL));
+// Use GCC 4.2 with Xcode 3.1, which includes GCC 4.2 but defaults to GCC 4.0.
+// Note that Xcode versions as new as 3.1.2 use XCODE_VERSION_ACTUAL for the minor version
+// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
+// XCODE_VERSION_ACTUAL for the full version number.
+GCC_VERSION = $(GCC_VERSION_$(XCODE_VERSION_MINOR));
+GCC_VERSION_ = $(GCC_VERSION_$(XCODE_VERSION_ACTUAL));
 GCC_VERSION_0310 = 4.2;