Changeset 268353 in webkit


Ignore:
Timestamp:
Oct 12, 2020 9:27:16 AM (3 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.

Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.

To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.

Note: This change should be reverted after <rdar://70185899> is resolved.

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

    r268331 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * DecoderTest/Configurations/DebugRelease.xcconfig:
     20        * MediaTime/Configurations/DebugRelease.xcconfig:
     21
    1222020-10-11  Darin Adler  <darin@apple.com>
    223
  • trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig

    r264839 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig

    r264746 r268353  
    2727ONLY_ACTIVE_ARCH = YES;
    2828
    29 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     29// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     30// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     32TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     33TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     34TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     39TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3040
    3141MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/JavaScriptCore/ChangeLog

    r268330 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Luming Yin  <luming_yin@apple.com>
    222
  • trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r268330 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Luming Yin  <luming_yin@apple.com>
    222
  • trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    66ONLY_ACTIVE_ARCH = YES;
    77
    8 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     8// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     9// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     10TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     11TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     12TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     13TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     14TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     15TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     16TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     17TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     18TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    919
    1020MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/ThirdParty/ChangeLog

    r267949 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * gtest/xcode/Config/General.xcconfig:
     20
    1212020-10-04  Ryan Hostetler  <rhost@apple.com>
    222
  • trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig

    r263745 r268353  
    6363CLANG_CXX_LIBRARY = libc++;
    6464
    65 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     65// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     66// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     67TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     68TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     69TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     70TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     71TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     72TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     73TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     74TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     75TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    6676
    6777COMBINE_HIDPI_IMAGES = YES;
  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r268330 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Luming Yin  <luming_yin@apple.com>
    222
  • trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    77ONLY_ACTIVE_ARCH = YES;
    88
    9 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     9// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     10// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     11TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     12TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     13TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     14TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     15TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     16TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     17TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     18TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     19TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    1020
    1121MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/WTF/ChangeLog

    r268334 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Michael Catanzaro  <mcatanzaro@gnome.org>
    222
  • trunk/Source/WTF/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     31// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     32TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     34TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     40TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3141
    3242MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/WebCore/ChangeLog

    r268352 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-12  Wenson Hsieh  <wenson_hsieh@apple.com>
    222
  • trunk/Source/WebCore/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/WebCore/PAL/ChangeLog

    r268330 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Luming Yin  <luming_yin@apple.com>
    222
  • trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/WebInspectorUI/ChangeLog

    r268330 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Luming Yin  <luming_yin@apple.com>
    222
  • trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    66ONLY_ACTIVE_ARCH = YES;
    77
    8 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     8// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     9// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     10TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     11TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     12TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     13TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     14TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     15TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     16TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     17TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     18TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    919
    1020MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/WebKit/ChangeLog

    r268349 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-12  Alex Christensen  <achristensen@webkit.org>
    222
  • trunk/Source/WebKit/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r268330 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Luming Yin  <luming_yin@apple.com>
    222
  • trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Source/bmalloc/ChangeLog

    r268330 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * Configurations/DebugRelease.xcconfig:
     20
    1212020-10-11  Luming Yin  <luming_yin@apple.com>
    222
  • trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     31// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
     32TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     34TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     40TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3141
    3242MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/ChangeLog

    r268342 r268353  
     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        Due to a bug in Xcode (rdar://70185899), Xcode 12.0 and Xcode 12.1 Beta incorrectly includes the
     11        minor release number in MAC_OS_X_VERSION_MAJOR, which causes Debug and Release builds of WebKit
     12        to be misconfigured when building on macOS Big Sur SUs, leading to webpages failing to load.
     13
     14        To work around the Xcode bug, when the MAC_OS_X_VERSION_MAJOR includes the minor version number,
     15        drop the minor version number by explicitly setting TARGET_MAC_OS_X_VERSION_MAJOR to 110000.
     16
     17        Note: This change should be reverted after <rdar://70185899> is resolved.
     18
     19        * ContentExtensionTester/Configurations/DebugRelease.xcconfig:
     20        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
     21        * ImageDiff/cg/Configurations/DebugRelease.xcconfig:
     22        * MiniBrowser/Configurations/DebugRelease.xcconfig:
     23        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
     24        * WebEditingTester/Configurations/DebugRelease.xcconfig:
     25        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
     26        * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
     27
    1282020-10-11  Sam Weinig  <weinig@apple.com>
    229
  • trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2626ONLY_ACTIVE_ARCH = YES;
    2727
    28 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     28// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     29// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     31TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     32TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     33TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     34TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     38TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    2939
    3040MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     31// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     32TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     34TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     40TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3141
    3242MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     31// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     32TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     33TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     34TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     40TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3141
    3242MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     32// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     33TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     34TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     38TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     39TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     40TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     41TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    3242
    3343MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
  • trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig

    r265315 r268353  
    2626ONLY_ACTIVE_ARCH = YES;
    2727
    28 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     28// FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
     29// TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
     31TARGET_MAC_OS_X_VERSION_MAJOR_110100 = 110000
     32TARGET_MAC_OS_X_VERSION_MAJOR_110200 = 110000
     33TARGET_MAC_OS_X_VERSION_MAJOR_110300 = 110000
     34TARGET_MAC_OS_X_VERSION_MAJOR_110400 = 110000
     35TARGET_MAC_OS_X_VERSION_MAJOR_110500 = 110000
     36TARGET_MAC_OS_X_VERSION_MAJOR_110600 = 110000
     37TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MAC_OS_X_VERSION_MAJOR))
     38TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    2939
    3040MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
Note: See TracChangeset for help on using the changeset viewer.