Changeset 122404 in webkit


Ignore:
Timestamp:
Jul 11, 2012 7:01:25 PM (12 years ago)
Author:
mrowe@apple.com
Message:

<​http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.

Reviewed by Dan Bernstein.

The deployment target is already set to the version that we're targeting, and it's that setting
which determines which functionality from the SDK is available to us.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig:

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig:

Source/WebCore:

  • Configurations/Base.xcconfig:

Source/WebKit/mac:

  • Configurations/Base.xcconfig:

Source/WebKit2:

  • Configurations/Base.xcconfig:

Source/WTF:

  • Configurations/Base.xcconfig:

Tools:

  • DumpRenderTree/mac/Configurations/Base.xcconfig:
  • TestWebKitAPI/Configurations/Base.xcconfig:
  • WebKitTestRunner/Configurations/Base.xcconfig:
Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r122392 r122404  
     12012-07-11  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        The deployment target is already set to the version that we're targeting, and it's that setting
     8        which determines which functionality from the SDK is available to us.
     9
     10        * Configurations/Base.xcconfig:
     11
    1122012-07-11  Filip Pizlo  <fpizlo@apple.com>
    213

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r122356 r122404  
    128128SECTORDER_FLAGS = -Wl,-order_file,JavaScriptCore.order;
    129129
    130 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    131 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    132 SDKROOT_1060_1050 = macosx10.5;
    133 SDKROOT_1070_1050 = macosx10.5;
    134 SDKROOT_1080_1050 = macosx10.5;
    135 SDKROOT_1090_1050 = macosx10.5;
    136 SDKROOT_1070_1060 = macosx10.6;
    137 SDKROOT_1080_1060 = macosx10.6;
    138 SDKROOT_1090_1060 = macosx10.6;
    139 SDKROOT_1080_1070 = macosx10.7;
    140 SDKROOT_1090_1070 = macosx10.7;
    141 SDKROOT_1090_1080 = macosx10.8;
     130TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     131TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     132TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     133TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     134TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     135
     136// Don't build against an SDK unless we're targeting an older OS version.
     137SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     138SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
    142139
    143140

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r121051 r122404  
     12012-07-11  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        The deployment target is already set to the version that we're targeting, and it's that setting
     8        which determines which functionality from the SDK is available to us.
     9
     10        * Configurations/Base.xcconfig:
     11
    1122012-06-22  Joshua Netterfield  <jnetterfield@rim.com>
    213

  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r115501 r122404  
    3939TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    4040
    41 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    42 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    43 SDKROOT_1060_1050 = macosx10.5;
    44 SDKROOT_1070_1050 = macosx10.5;
    45 SDKROOT_1080_1050 = macosx10.5;
    46 SDKROOT_1090_1050 = macosx10.5;
    47 SDKROOT_1070_1060 = macosx10.6;
    48 SDKROOT_1080_1060 = macosx10.6;
    49 SDKROOT_1090_1060 = macosx10.6;
    50 SDKROOT_1080_1070 = macosx10.7;
    51 SDKROOT_1090_1070 = macosx10.7;
    52 SDKROOT_1090_1080 = macosx10.8;
     41TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     42TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     43TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     44TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     45TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     46
     47// Don't build against an SDK unless we're targeting an older OS version.
     48SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     49SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;

  • trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig

    r121331 r122404  
    5353TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    5454
    55 // If the target Mac OS X version does not match the current Mac OS X version,
    56 // then we'll want to build using the target version's SDK.
    57 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    58 SDKROOT_1050_1040 = macosx10.4;
    59 SDKROOT_1060_1040 = macosx10.4;
    60 SDKROOT_1060_1050 = macosx10.5;
    61 SDKROOT_1070_1040 = macosx10.4;
    62 SDKROOT_1080_1040 = macosx10.4;
    63 SDKROOT_1090_1040 = macosx10.4;
    64 SDKROOT_1070_1050 = macosx10.5;
    65 SDKROOT_1080_1050 = macosx10.5;
    66 SDKROOT_1090_1050 = macosx10.5;
    67 SDKROOT_1070_1060 = macosx10.6;
    68 SDKROOT_1080_1060 = macosx10.6;
    69 SDKROOT_1090_1060 = macosx10.6;
    70 SDKROOT_1080_1070 = macosx10.7;
    71 SDKROOT_1090_1070 = macosx10.7;
    72 SDKROOT_1090_1080 = macosx10.8;
     55TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     56TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     57TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     58TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     59TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     60
     61// Don't build against an SDK unless we're targeting an older OS version.
     62SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     63SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
    7364
    7465// VERSIONING BUILD SETTINGS (used in Info.plist)

  • trunk/Source/WTF/ChangeLog

    r122402 r122404  
     12012-07-11  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        The deployment target is already set to the version that we're targeting, and it's that setting
     8        which determines which functionality from the SDK is available to us.
     9
     10        * Configurations/Base.xcconfig:
     11
    1122012-07-11  Mark Rowe  <mrowe@apple.com>
    213

  • trunk/Source/WTF/Configurations/Base.xcconfig

    r122356 r122404  
    109109DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
    110110
    111 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    112 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    113 SDKROOT_1060_1050 = macosx10.5;
    114 SDKROOT_1070_1050 = macosx10.5;
    115 SDKROOT_1080_1050 = macosx10.5;
    116 SDKROOT_1090_1050 = macosx10.5;
    117 SDKROOT_1070_1060 = macosx10.6;
    118 SDKROOT_1080_1060 = macosx10.6;
    119 SDKROOT_1090_1060 = macosx10.6;
    120 SDKROOT_1080_1070 = macosx10.7;
    121 SDKROOT_1090_1070 = macosx10.7;
    122 SDKROOT_1090_1080 = macosx10.8;
     111TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     112TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     113TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     114TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     115TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
    123116
     117// Don't build against an SDK unless we're targeting an older OS version.
     118SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     119SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;

  • trunk/Source/WebCore/ChangeLog

    r122401 r122404  
     12012-07-11  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        The deployment target is already set to the version that we're targeting, and it's that setting
     8        which determines which functionality from the SDK is available to us.
     9
     10        * Configurations/Base.xcconfig:
     11
    1122012-07-11  Mark Rowe  <mrowe@apple.com>
    213

  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r122356 r122404  
    126126GCC_GENERATE_DEBUGGING_SYMBOLS_macosx_1090 = YES;
    127127
    128 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    129 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    130 SDKROOT_1060_1050 = macosx10.5;
    131 SDKROOT_1070_1050 = macosx10.5;
    132 SDKROOT_1080_1050 = macosx10.5;
    133 SDKROOT_1090_1050 = macosx10.5;
    134 SDKROOT_1070_1060 = macosx10.6;
    135 SDKROOT_1080_1060 = macosx10.6;
    136 SDKROOT_1090_1060 = macosx10.6;
    137 SDKROOT_1080_1070 = macosx10.7;
    138 SDKROOT_1090_1070 = macosx10.7;
    139 SDKROOT_1090_1080 = macosx10.8;
     128TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     129TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     130TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     131TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     132TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     133
     134// Don't build against an SDK unless we're targeting an older OS version.
     135SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     136SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;

  • trunk/Source/WebKit/mac/ChangeLog

    r122403 r122404  
     12012-07-11  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        The deployment target is already set to the version that we're targeting, and it's that setting
     8        which determines which functionality from the SDK is available to us.
     9
     10        * Configurations/Base.xcconfig:
     11
    1122012-07-11  Mark Rowe  <mrowe@apple.com>
    213

  • trunk/Source/WebKit/mac/Configurations/Base.xcconfig

    r122356 r122404  
    102102SECTORDER_FLAGS = -Wl,-order_file,mac/WebKit.order;
    103103
    104 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    105 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    106 SDKROOT_1060_1050 = macosx10.5;
    107 SDKROOT_1070_1050 = macosx10.5;
    108 SDKROOT_1080_1050 = macosx10.5;
    109 SDKROOT_1090_1050 = macosx10.5;
    110 SDKROOT_1070_1060 = macosx10.6;
    111 SDKROOT_1080_1060 = macosx10.6;
    112 SDKROOT_1090_1060 = macosx10.6;
    113 SDKROOT_1080_1070 = macosx10.7;
    114 SDKROOT_1090_1070 = macosx10.7;
    115 SDKROOT_1090_1080 = macosx10.8;
     104TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     105TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     106TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     107TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     108TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     109
     110// Don't build against an SDK unless we're targeting an older OS version.
     111SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     112SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;

  • trunk/Source/WebKit2/ChangeLog

    r122403 r122404  
     12012-07-11  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        The deployment target is already set to the version that we're targeting, and it's that setting
     8        which determines which functionality from the SDK is available to us.
     9
     10        * Configurations/Base.xcconfig:
     11
    1122012-07-11  Mark Rowe  <mrowe@apple.com>
    213

  • trunk/Source/WebKit2/Configurations/Base.xcconfig

    r122356 r122404  
    9898SECTORDER_FLAGS = -Wl,-order_file,mac/WebKit2.order;
    9999
    100 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    101 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    102 SDKROOT_1060_1050 = macosx10.5;
    103 SDKROOT_1070_1050 = macosx10.5;
    104 SDKROOT_1080_1050 = macosx10.5;
    105 SDKROOT_1090_1050 = macosx10.5;
    106 SDKROOT_1070_1060 = macosx10.6;
    107 SDKROOT_1080_1060 = macosx10.6;
    108 SDKROOT_1090_1060 = macosx10.6;
    109 SDKROOT_1080_1070 = macosx10.7;
    110 SDKROOT_1090_1070 = macosx10.7;
    111 SDKROOT_1090_1080 = macosx10.8;
     100TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     101TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     102TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     103TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     104TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     105
     106// Don't build against an SDK unless we're targeting an older OS version.
     107SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     108SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;

  • trunk/Tools/ChangeLog

    r122402 r122404  
     12012-07-11  Mark Rowe  <mrowe@apple.com>
     2
     3        <http://webkit.org/b/91024> Build against the latest SDK when targeting older OS X versions.
     4
     5        Reviewed by Dan Bernstein.
     6
     7        The deployment target is already set to the version that we're targeting, and it's that setting
     8        which determines which functionality from the SDK is available to us.
     9
     10        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     11        * TestWebKitAPI/Configurations/Base.xcconfig:
     12        * WebKitTestRunner/Configurations/Base.xcconfig:
     13
    1142012-07-11  Mark Rowe  <mrowe@apple.com>
    215

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r119140 r122404  
    5656
    5757
    58 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    59 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    60 SDKROOT_1060_1050 = macosx10.5;
    61 SDKROOT_1070_1050 = macosx10.5;
    62 SDKROOT_1080_1050 = macosx10.5;
    63 SDKROOT_1090_1050 = macosx10.5;
    64 SDKROOT_1070_1060 = macosx10.6;
    65 SDKROOT_1080_1060 = macosx10.6;
    66 SDKROOT_1090_1060 = macosx10.6;
    67 SDKROOT_1080_1070 = macosx10.7;
    68 SDKROOT_1090_1070 = macosx10.7;
    69 SDKROOT_1090_1080 = macosx10.8;
     58TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     59TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     60TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     61TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     62TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     63
     64// Don't build against an SDK unless we're targeting an older OS version.
     65SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     66SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;

  • trunk/Tools/MiniBrowser/Configurations/Base.xcconfig

    r115501 r122404  
    5151TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    5252
    53 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    54 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 SDKROOT_1060_1050 = macosx10.5;
    56 SDKROOT_1070_1050 = macosx10.5;
    57 SDKROOT_1080_1050 = macosx10.5;
    58 SDKROOT_1090_1050 = macosx10.5;
    59 SDKROOT_1070_1060 = macosx10.6;
    60 SDKROOT_1080_1060 = macosx10.6;
    61 SDKROOT_1090_1060 = macosx10.6;
    62 SDKROOT_1080_1070 = macosx10.7;
    63 SDKROOT_1090_1070 = macosx10.7;
    64 SDKROOT_1090_1080 = macosx10.8;
     53TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     54TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     55TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     56TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     57TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     58
     59// Don't build against an SDK unless we're targeting an older OS version.
     60SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     61SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r121331 r122404  
    6464
    6565
    66 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    67 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    68 SDKROOT_1060_1050 = macosx10.5;
    69 SDKROOT_1070_1050 = macosx10.5;
    70 SDKROOT_1080_1050 = macosx10.5;
    71 SDKROOT_1090_1050 = macosx10.5;
    72 SDKROOT_1070_1060 = macosx10.6;
    73 SDKROOT_1080_1060 = macosx10.6;
    74 SDKROOT_1090_1060 = macosx10.6;
    75 SDKROOT_1080_1070 = macosx10.7;
    76 SDKROOT_1090_1070 = macosx10.7;
    77 SDKROOT_1090_1080 = macosx10.8;
     66TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     67TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     68TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     69TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     70TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     71
     72// Don't build against an SDK unless we're targeting an older OS version.
     73SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     74SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
    7875
    7976WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r119140 r122404  
    6161TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    6262
    63 // If the target Mac OS X version does not match the current Mac OS X version then we'll want to build using the target version's SDK.
    64 SDKROOT = $(SDKROOT_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    65 SDKROOT_1060_1050 = macosx10.5;
    66 SDKROOT_1070_1050 = macosx10.5;
    67 SDKROOT_1080_1050 = macosx10.5;
    68 SDKROOT_1090_1050 = macosx10.5;
    69 SDKROOT_1070_1060 = macosx10.6;
    70 SDKROOT_1080_1060 = macosx10.6;
    71 SDKROOT_1090_1060 = macosx10.6;
    72 SDKROOT_1080_1070 = macosx10.7;
    73 SDKROOT_1090_1070 = macosx10.7;
    74 SDKROOT_1090_1080 = macosx10.8;
     63TARGETING_SAME_OS_X_VERSION = $(TARGETING_SAME_OS_X_VERSION_$(MAC_OS_X_VERSION_MAJOR)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     64TARGETING_SAME_OS_X_VERSION_1060_1060 = YES;
     65TARGETING_SAME_OS_X_VERSION_1070_1070 = YES;
     66TARGETING_SAME_OS_X_VERSION_1080_1080 = YES;
     67TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
     68
     69// Don't build against an SDK unless we're targeting an older OS version.
     70SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
     71SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
    7572
    7673WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
Note: See TracChangeset for help on using the changeset viewer.