Changeset 55867 in webkit for trunk/JavaScriptCore/Configurations


Ignore:
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.

Location:
trunk/JavaScriptCore/Configurations
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/Configurations/Base.xcconfig

    r54838 r55867  
    6868REAL_PLATFORM_NAME_macosx = macosx;
    6969
     70TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     71
    7072
    7173// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
    … …  
    9395// number.  Newer versions of Xcode use XCODE_VERSION_MINOR for the minor version, and
    9496// XCODE_VERSION_ACTUAL for the full version number.
    95 GCC_VERSION = $(GCC_VERSION_$(XCODE_VERSION_MINOR));
    96 GCC_VERSION_ = $(GCC_VERSION_$(XCODE_VERSION_ACTUAL));
    97 GCC_VERSION_0310 = 4.2;
     97TARGET_GCC_VERSION = $(TARGET_GCC_VERSION_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     98TARGET_GCC_VERSION_ = $(TARGET_GCC_VERSION_1040);
     99TARGET_GCC_VERSION_1040 = GCC_40;
     100TARGET_GCC_VERSION_1050 = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_MINOR));
     101TARGET_GCC_VERSION_1050_ = $(TARGET_GCC_VERSION_1050_$(XCODE_VERSION_ACTUAL));
     102TARGET_GCC_VERSION_1050_0310 = GCC_42;
     103TARGET_GCC_VERSION_1050_0320 = GCC_42;
     104TARGET_GCC_VERSION_1060 = GCC_42;
     105TARGET_GCC_VERSION_1070 = LLVM_GCC_42;
     106
     107GCC_VERSION = $(GCC_VERSION_$(TARGET_GCC_VERSION));
     108GCC_VERSION_GCC_40 = 4.0;
     109GCC_VERSION_GCC_42 = 4.2;
     110GCC_VERSION_LLVM_GCC_42 = com.apple.compilers.llvmgcc42;
    98111
    99112
    … …  
    102115HAVE_DTRACE_iphoneos = 1;
    103116HAVE_DTRACE_iphonesimulator = 0;
    104 HAVE_DTRACE_macosx = $(HAVE_DTRACE_macosx_$(MAC_OS_X_VERSION_MAJOR));
     117HAVE_DTRACE_macosx = $(HAVE_DTRACE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    105118HAVE_DTRACE_macosx_ = $(HAVE_DTRACE_macosx_1040);
    106119HAVE_DTRACE_macosx_1040 = 0;

  • trunk/JavaScriptCore/Configurations/DebugRelease.xcconfig

    r49969 r55867  
    2727ARCHS_iphoneos = $(ARCHS_UNIVERSAL_IPHONE_OS);
    2828ARCHS_iphonesimulator = $(NATIVE_ARCH);
    29 ARCHS_macosx = $(ARCHS_macosx_$(MAC_OS_X_VERSION_MAJOR));
     29ARCHS_macosx = $(ARCHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3030ARCHS_macosx_ = $(ARCHS_macosx_1040);
    3131ARCHS_macosx_1040 = $(NATIVE_ARCH);
    … …  
    3636ONLY_ACTIVE_ARCH = YES;
    3737
    38 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR));
     38MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3939MACOSX_DEPLOYMENT_TARGET_ = 10.4;
    4040MACOSX_DEPLOYMENT_TARGET_1040 = 10.4;

  • trunk/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r55670 r55867  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(MAC_OS_X_VERSION_MAJOR));
     34ENABLE_3D_CANVAS = $(ENABLE_3D_CANVAS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3535ENABLE_3D_CANVAS_1050 = ENABLE_3D_CANVAS;
    3636ENABLE_3D_CANVAS_1060 = ENABLE_3D_CANVAS;
    3737ENABLE_3D_CANVAS_1070 = ENABLE_3D_CANVAS;
    3838
    39 ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(MAC_OS_X_VERSION_MAJOR));
     39ENABLE_3D_RENDERING = $(ENABLE_3D_RENDERING_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    4040ENABLE_3D_RENDERING_1050 = ENABLE_3D_RENDERING;
    4141ENABLE_3D_RENDERING_1060 = ENABLE_3D_RENDERING;

  • trunk/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

    r44504 r55867  
    4545
    4646OTHER_CFLAGS = $(OTHER_CFLAGS_$(CONFIGURATION)_$(CURRENT_VARIANT));
    47 OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL));
    48 OTHER_CFLAGS_Production_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL));
    49 OTHER_CFLAGS_normal_0310 = $(OTHER_CFLAGS_normal_GCC_42);
    50 OTHER_CFLAGS_normal_0320 = $(OTHER_CFLAGS_normal_GCC_42);
     47OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION));
     48OTHER_CFLAGS_Production_normal = $(OTHER_CFLAGS_normal_$(TARGET_GCC_VERSION));
    5149OTHER_CFLAGS_normal_GCC_42 = -fomit-frame-pointer -funwind-tables;
     50OTHER_CFLAGS_normal_LLVM_GCC_42 = $(OTHER_CFLAGS_normal_GCC_42);

  • trunk/JavaScriptCore/Configurations/Version.xcconfig

    r55755 r55867  
    3232
    3333// The system version prefix is based on the current system version.
    34 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(MAC_OS_X_VERSION_MAJOR));
     34SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3535SYSTEM_VERSION_PREFIX_ = 4; // Some Tiger versions of Xcode don't set MAC_OS_X_VERSION_MAJOR.
    3636SYSTEM_VERSION_PREFIX_1040 = 4;
Note: See TracChangeset for help on using the changeset viewer.