Changeset 268371 in webkit


Ignore:
Timestamp:
Oct 12, 2020 3:09:36 PM (4 years ago)
Author:
commit-queue@webkit.org
Message:

[macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
with Xcode 12 on macOS Big Sur SUs
​https://bugs.webkit.org/show_bug.cgi?id=217602
rdar://70194453

Patch by Luming Yin <​luming_yin@apple.com> on 2020-10-12
Reviewed by Darin Adler.

The previous workaround turns out to be ineffective because we can't set the value of
TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
adjust MAC_OS_X_VERSION_MAJOR to 110000.

PerformanceTests:

  • DecoderTest/Configurations/DebugRelease.xcconfig:
  • MediaTime/Configurations/DebugRelease.xcconfig:

Source/bmalloc:

  • Configurations/DebugRelease.xcconfig:

Source/JavaScriptCore:

  • Configurations/DebugRelease.xcconfig:

Source/ThirdParty:

  • gtest/xcode/Config/General.xcconfig:

Source/ThirdParty/ANGLE:

  • Configurations/DebugRelease.xcconfig:

Source/ThirdParty/libwebrtc:

  • Configurations/DebugRelease.xcconfig:

Source/WebCore:

  • Configurations/DebugRelease.xcconfig:

Source/WebCore/PAL:

  • Configurations/DebugRelease.xcconfig:

Source/WebInspectorUI:

  • Configurations/DebugRelease.xcconfig:

Source/WebKit:

  • Configurations/DebugRelease.xcconfig:

Source/WebKitLegacy/mac:

  • Configurations/DebugRelease.xcconfig:

Source/WTF:

  • Configurations/DebugRelease.xcconfig:

Tools:

  • ContentExtensionTester/Configurations/DebugRelease.xcconfig:
  • DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
  • ImageDiff/cg/Configurations/DebugRelease.xcconfig:
  • MiniBrowser/Configurations/DebugRelease.xcconfig:
  • TestWebKitAPI/Configurations/DebugRelease.xcconfig:
  • WebEditingTester/Configurations/DebugRelease.xcconfig:
  • WebKitTestRunner/Configurations/DebugRelease.xcconfig:
  • lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
Location:
trunk
Files:
34 edited

Legend:

Unmodified
Added
Removed

  • trunk/PerformanceTests/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * DecoderTest/Configurations/DebugRelease.xcconfig:
     16        * MediaTime/Configurations/DebugRelease.xcconfig:
     17
    1182020-10-12  Luming Yin  <luming_yin@apple.com>
    219

  • trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    3030
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    2828
    2929// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    30 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    32 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    33 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     30// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     31TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     32TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     33TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     34TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     38
     39TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     40TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    3941TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4042

  • trunk/Source/JavaScriptCore/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

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

    r268353 r268371  
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    3232// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

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

    r268353 r268371  
    88// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    99// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    10 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    11 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    12 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    13 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    14 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    15 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    16 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    17 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     10TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     11TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     12TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     13TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     14TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     15TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     16TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     17
     18TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     19TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    1820TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    1921

  • trunk/Source/ThirdParty/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * gtest/xcode/Config/General.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

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

    r268353 r268371  
    6464
    6565// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    66 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    67 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    68 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    69 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    70 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    71 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    72 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    73 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    74 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     66// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     67TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     68TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     69TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     70TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     71TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     72TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     73TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     74
     75TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     76TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    7577TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    7678

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

  • trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    99// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    1010// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    11 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    12 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    13 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    14 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    15 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    16 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    17 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    18 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     11TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     12TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     13TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     14TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     15TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     16TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     17TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     18
     19TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     20TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    1921TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    2022

  • trunk/Source/WTF/ChangeLog

    r268367 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Andy Estes  <aestes@apple.com>
    218

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

    r268353 r268371  
    3030// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    3131// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     32TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     34TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     39
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4042TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4143

  • trunk/Source/WebCore/ChangeLog

    r268369 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Chris Dumez  <cdumez@apple.com>
    218

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

    r268353 r268371  
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    3232// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Source/WebCore/PAL/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

  • trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    3232// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Source/WebInspectorUI/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

  • trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    88// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    99// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    10 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    11 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    12 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    13 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    14 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    15 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    16 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    17 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     10TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     11TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     12TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     13TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     14TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     15TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     16TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     17
     18TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     19TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    1820TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    1921

  • trunk/Source/WebKit/ChangeLog

    r268367 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Andy Estes  <aestes@apple.com>
    218

  • trunk/Source/WebKit/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    3232// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

  • trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    3232// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Source/bmalloc/ChangeLog

    r268353 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * Configurations/DebugRelease.xcconfig:
     16
    1172020-10-12  Luming Yin  <luming_yin@apple.com>
    218

  • trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    3030// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    3131// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     32TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     34TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     39
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4042TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4143

  • trunk/Tools/ChangeLog

    r268370 r268371  
     12020-10-12  Luming Yin  <luming_yin@apple.com>
     2
     3        [macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building
     4        with Xcode 12 on macOS Big Sur SUs
     5        https://bugs.webkit.org/show_bug.cgi?id=217602
     6        rdar://70194453
     7
     8        Reviewed by Darin Adler.
     9
     10        The previous workaround turns out to be ineffective because we can't set the value of
     11        TARGET_MAC_OS_X_VERSION_MAJOR based on a previous value of itself. Introduce a new
     12        variable TARGET_MAC_OS_X_VERSION_MAJOR to determine whether we need to explicitly
     13        adjust MAC_OS_X_VERSION_MAJOR to 110000.
     14
     15        * ContentExtensionTester/Configurations/DebugRelease.xcconfig:
     16        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
     17        * ImageDiff/cg/Configurations/DebugRelease.xcconfig:
     18        * MiniBrowser/Configurations/DebugRelease.xcconfig:
     19        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
     20        * WebEditingTester/Configurations/DebugRelease.xcconfig:
     21        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
     22        * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
     23
    1242020-10-12  Sam Weinig  <weinig@apple.com>
    225

  • trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    2727
    2828// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    29 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    30 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    31 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    32 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    33 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     29// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     30TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     31TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     32TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     33TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     34TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     37
     38TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     39TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    3840TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3941

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

    r268353 r268371  
    3030
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    2929
    3030// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    31 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     31// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     32TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     34TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     39
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4042TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4143

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

    r268353 r268371  
    3030
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

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

    r268353 r268371  
    3030
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    2929
    3030// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    31 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     31// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     32TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     34TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     39
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4042TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4143

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

    r268353 r268371  
    3030
    3131// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    33 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    38 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     37TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     38TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     39TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     40
     41TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     42TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    4143TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    4244

  • trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig

    r268353 r268371  
    2727
    2828// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    29 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    30 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    31 TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
    32 TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
    33 TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
    34 TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
    35 TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
    36 TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
    37 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     29// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     30TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     31TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
     32TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
     33TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
     34TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
     35TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
     36TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
     37
     38TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
     39TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    3840TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3941
Note: See TracChangeset for help on using the changeset viewer.