Changeset 55867 in webkit for trunk/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

Timestamp:

Mar 11, 2010, 4:44:29 PM (15 years ago)

Author:

[email protected]

Message:

<rdar://problem/7745082> Make it possible to build WebKit for older Mac OS X versions from the current Mac OS X version

Reviewed by Tim Hatcher.

Introduce TARGET_MAC_OS_X_VERSION_MAJOR to represent the Mac OS X version that is being targeted. It defaults to the
current Mac OS X version unless otherwise specified.

Key off TARGET_MAC_OS_X_VERSION_MAJOR where we'd previously been keying off MAC_OS_X_VERSION_MAJOR.

Explicitly map from the target Mac OS X version to the preferred compiler since Xcode's default compiler choice
may not be usable when targetting a different Mac OS X version.

Key off TARGET_GCC_VERSION rather than MAC_OS_X_VERSION_MAJOR in locations where we'd previously been keying off
MAC_OS_X_VERSION_MAJOR but the decision is really related to the compiler version being used.

JavaScriptCore:

• Configurations/Base.xcconfig:
• Configurations/DebugRelease.xcconfig:
• Configurations/FeatureDefines.xcconfig:
• Configurations/JavaScriptCore.xcconfig:
• Configurations/Version.xcconfig:

JavaScriptGlue:

• Configurations/Base.xcconfig:
• Configurations/DebugRelease.xcconfig:
• Configurations/Version.xcconfig:
• JavaScriptGlue.xcodeproj/project.pbxproj:

WebCore:

• Configurations/Base.xcconfig:
• Configurations/DebugRelease.xcconfig:
• Configurations/FeatureDefines.xcconfig:
• Configurations/Version.xcconfig:
• Configurations/WebCore.xcconfig:

WebKit/mac:

• Configurations/Base.xcconfig:
• Configurations/DebugRelease.xcconfig:
• Configurations/FeatureDefines.xcconfig:
• Configurations/Version.xcconfig:

WebKitTools:

• DumpRenderTree/mac/Configurations/Base.xcconfig:
• DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
• DumpRenderTree/mac/DumpRenderTree.mm: Wrap the include of mach-o/getsect.h in 'extern "C"' as some versions of the

header in older SDKs do not do this inside the header.

File:

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

trunk/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

@@ -45 +45 @@
 
 OTHER_CFLAGS = $(OTHER_CFLAGS_$(CONFIGURATION)_$(CURRENT_VARIANT));
-OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL));
-OTHER_CFLAGS_Production_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL));
-OTHER_CFLAGS_normal_0310 = $(OTHER_CFLAGS_normal_GCC_42);
-OTHER_CFLAGS_normal_0320 = $(OTHER_CFLAGS_normal_GCC_42);
+OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION));
+OTHER_CFLAGS_Production_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION));
 OTHER_CFLAGS_normal_GCC_42 = -fomit-frame-pointer -funwind-tables;
+OTHER_CFLAGS_normal_LLVM_GCC_42 = $(OTHER_CFLAGS_normal_GCC_42);