Skip to content

Commit bbe0525

Browse files
keith-rollinkeith-rollin
committed
Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support
https://bugs.webkit.org/show_bug.cgi?id=217649 <rdar://problem/70236877> Reviewed by Darin Adler. Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_<PLATFORM> as "support for compiling WebKit against iOS SDKs". Support for the iOS part of this feature was later removed in several changes, including Bug 139212, Bug 139463 and Bug 144762. However, vestiges have remained for five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer needed and can be removed. This changes brings most projects in conformance with other projects that don't support including the platform in MACOSX_DEPLOYMENT_TARGET, including WebEditingTester, gtest, WebKitTestRunner, MiniBrowser, and TestWebKitAPI. Along the way, remove a couple of left-over references to macOS 10.16, and a couple of places where [sdk=macosx*] was still being used. With this change, initialization of MACOSX_DEPLOYMENT_TARGET should be consistent across all projects, with two exceptions: WebKitLauncher (which hardcodes it to 10.12) and libwebrtc's copy of googletest (which hardcodes it to 10.4). The reasons for these hard-coded values is not apparent, so leave them be. PerformanceTests: * DecoderTest/Configurations/DebugRelease.xcconfig: * MediaTime/Configurations/DebugRelease.xcconfig: Source/bmalloc: * Configurations/DebugRelease.xcconfig: Source/JavaScriptCore: * Configurations/DebugRelease.xcconfig: Source/ThirdParty/ANGLE: * Configurations/DebugRelease.xcconfig: Source/ThirdParty/libwebrtc: * Configurations/DebugRelease.xcconfig: Source/WebCore: No new tests -- no changed functionality. * 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: * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig: Canonical link: https://commits.webkit.org/230417@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268420 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent b1d39f6 commit bbe0525

28 files changed

Lines changed: 486 additions & 98 deletions

File tree

‎PerformanceTests/ChangeLog‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
2020-10-13 Keith Rollin <krollin@apple.com>
2+
3+
Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support
4+
https://bugs.webkit.org/show_bug.cgi?id=217649
5+
<rdar://problem/70236877>
6+
7+
Reviewed by Darin Adler.
8+
9+
Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_<PLATFORM> as "support
10+
for compiling WebKit against iOS SDKs". Support for the iOS part of
11+
this feature was later removed in several changes, including Bug
12+
139212, Bug 139463 and Bug 144762. However, vestiges have remained for
13+
five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The
14+
inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer
15+
needed and can be removed.
16+
17+
This changes brings most projects in conformance with other projects
18+
that don't support including the platform in MACOSX_DEPLOYMENT_TARGET,
19+
including WebEditingTester, gtest, WebKitTestRunner, MiniBrowser, and
20+
TestWebKitAPI.
21+
22+
Along the way, remove a couple of left-over references to macOS 10.16,
23+
and a couple of places where [sdk=macosx*] was still being used.
24+
25+
With this change, initialization of MACOSX_DEPLOYMENT_TARGET should be
26+
consistent across all projects, with two exceptions: WebKitLauncher
27+
(which hardcodes it to 10.12) and libwebrtc's copy of googletest
28+
(which hardcodes it to 10.4). The reasons for these hard-coded values
29+
is not apparent, so leave them be.
30+
31+
* DecoderTest/Configurations/DebugRelease.xcconfig:
32+
* MediaTime/Configurations/DebugRelease.xcconfig:
33+
134
2020-10-12 Luming Yin <luming_yin@apple.com>
235

336
[macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building

‎PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,12 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_1
4242
TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
4343
TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
4444

45-
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
46-
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
47-
MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
48-
MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
49-
MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
50-
MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
51-
MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
45+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
46+
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
47+
MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
48+
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
49+
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
50+
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
5251

5352
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
5453
DEBUG_INFORMATION_FORMAT = dwarf;

‎PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_1
4040
TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
4141
TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
4242

43-
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
44-
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
45-
MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
46-
MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
47-
MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
48-
MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
49-
MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
43+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
44+
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
45+
MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
46+
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
47+
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
48+
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
5049

5150
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
5251
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
2020-10-13 Keith Rollin <krollin@apple.com>
2+
3+
Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support
4+
https://bugs.webkit.org/show_bug.cgi?id=217649
5+
<rdar://problem/70236877>
6+
7+
Reviewed by Darin Adler.
8+
9+
Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_<PLATFORM> as "support
10+
for compiling WebKit against iOS SDKs". Support for the iOS part of
11+
this feature was later removed in several changes, including Bug
12+
139212, Bug 139463 and Bug 144762. However, vestiges have remained for
13+
five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The
14+
inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer
15+
needed and can be removed.
16+
17+
This changes brings most projects in conformance with other projects
18+
that don't support including the platform in MACOSX_DEPLOYMENT_TARGET,
19+
including WebEditingTester, gtest, WebKitTestRunner, MiniBrowser, and
20+
TestWebKitAPI.
21+
22+
Along the way, remove a couple of left-over references to macOS 10.16,
23+
and a couple of places where [sdk=macosx*] was still being used.
24+
25+
With this change, initialization of MACOSX_DEPLOYMENT_TARGET should be
26+
consistent across all projects, with two exceptions: WebKitLauncher
27+
(which hardcodes it to 10.12) and libwebrtc's copy of googletest
28+
(which hardcodes it to 10.4). The reasons for these hard-coded values
29+
is not apparent, so leave them be.
30+
31+
* Configurations/DebugRelease.xcconfig:
32+
133
2020-10-12 Yusuke Suzuki <ysuzuki@apple.com>
234

335
JIT operations do not need extern "C"

‎Source/JavaScriptCore/Configurations/DebugRelease.xcconfig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_1
4242
TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
4343
TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
4444

45-
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
46-
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
47-
MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
48-
MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
49-
MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
50-
MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
45+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
46+
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
47+
MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
48+
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
49+
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
50+
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
5151

5252
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
5353
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/ThirdParty/ANGLE/ChangeLog‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
2020-10-13 Keith Rollin <krollin@apple.com>
2+
3+
Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support
4+
https://bugs.webkit.org/show_bug.cgi?id=217649
5+
<rdar://problem/70236877>
6+
7+
Reviewed by Darin Adler.
8+
9+
Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_<PLATFORM> as "support
10+
for compiling WebKit against iOS SDKs". Support for the iOS part of
11+
this feature was later removed in several changes, including Bug
12+
139212, Bug 139463 and Bug 144762. However, vestiges have remained for
13+
five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The
14+
inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer
15+
needed and can be removed.
16+
17+
This changes brings most projects in conformance with other projects
18+
that don't support including the platform in MACOSX_DEPLOYMENT_TARGET,
19+
including WebEditingTester, gtest, WebKitTestRunner, MiniBrowser, and
20+
TestWebKitAPI.
21+
22+
Along the way, remove a couple of left-over references to macOS 10.16,
23+
and a couple of places where [sdk=macosx*] was still being used.
24+
25+
With this change, initialization of MACOSX_DEPLOYMENT_TARGET should be
26+
consistent across all projects, with two exceptions: WebKitLauncher
27+
(which hardcodes it to 10.12) and libwebrtc's copy of googletest
28+
(which hardcodes it to 10.4). The reasons for these hard-coded values
29+
is not apparent, so leave them be.
30+
31+
* Configurations/DebugRelease.xcconfig:
32+
133
2020-10-12 Luming Yin <luming_yin@apple.com>
234

335
[macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building

‎Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_1
1919
TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
2020
TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
2121

22-
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
23-
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
24-
MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
25-
MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
26-
MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
27-
MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
22+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
23+
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
24+
MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
25+
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
26+
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
27+
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
2828

2929
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
3030
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/ThirdParty/libwebrtc/ChangeLog‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
2020-10-13 Keith Rollin <krollin@apple.com>
2+
3+
Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support
4+
https://bugs.webkit.org/show_bug.cgi?id=217649
5+
<rdar://problem/70236877>
6+
7+
Reviewed by Darin Adler.
8+
9+
Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_<PLATFORM> as "support
10+
for compiling WebKit against iOS SDKs". Support for the iOS part of
11+
this feature was later removed in several changes, including Bug
12+
139212, Bug 139463 and Bug 144762. However, vestiges have remained for
13+
five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The
14+
inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer
15+
needed and can be removed.
16+
17+
This changes brings most projects in conformance with other projects
18+
that don't support including the platform in MACOSX_DEPLOYMENT_TARGET,
19+
including WebEditingTester, gtest, WebKitTestRunner, MiniBrowser, and
20+
TestWebKitAPI.
21+
22+
Along the way, remove a couple of left-over references to macOS 10.16,
23+
and a couple of places where [sdk=macosx*] was still being used.
24+
25+
With this change, initialization of MACOSX_DEPLOYMENT_TARGET should be
26+
consistent across all projects, with two exceptions: WebKitLauncher
27+
(which hardcodes it to 10.12) and libwebrtc's copy of googletest
28+
(which hardcodes it to 10.4). The reasons for these hard-coded values
29+
is not apparent, so leave them be.
30+
31+
* Configurations/DebugRelease.xcconfig:
32+
133
2020-10-12 Luming Yin <luming_yin@apple.com>
234

335
[macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building

‎Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_1
2020
TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
2121
TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
2222

23-
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
24-
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
25-
MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
26-
MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
27-
MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
28-
MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
23+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
24+
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
25+
MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
26+
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
27+
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
28+
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
2929

3030
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
3131
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/WTF/ChangeLog‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
2020-10-13 Keith Rollin <krollin@apple.com>
2+
3+
Remove leftover MACOSX_DEPLOYMENT_TARGET_macosx support
4+
https://bugs.webkit.org/show_bug.cgi?id=217649
5+
<rdar://problem/70236877>
6+
7+
Reviewed by Darin Adler.
8+
9+
Bug 42796 introduced MACOSX_DEPLOYMENT_TARGET_<PLATFORM> as "support
10+
for compiling WebKit against iOS SDKs". Support for the iOS part of
11+
this feature was later removed in several changes, including Bug
12+
139212, Bug 139463 and Bug 144762. However, vestiges have remained for
13+
five or six years in the form of MACOSX_DEPLOYMENT_TARGET_macosx. The
14+
inclusion of the platform in MACOSX_DEPLOYMENT_TARGET is no longer
15+
needed and can be removed.
16+
17+
This changes brings most projects in conformance with other projects
18+
that don't support including the platform in MACOSX_DEPLOYMENT_TARGET,
19+
including WebEditingTester, gtest, WebKitTestRunner, MiniBrowser, and
20+
TestWebKitAPI.
21+
22+
Along the way, remove a couple of left-over references to macOS 10.16,
23+
and a couple of places where [sdk=macosx*] was still being used.
24+
25+
With this change, initialization of MACOSX_DEPLOYMENT_TARGET should be
26+
consistent across all projects, with two exceptions: WebKitLauncher
27+
(which hardcodes it to 10.12) and libwebrtc's copy of googletest
28+
(which hardcodes it to 10.4). The reasons for these hard-coded values
29+
is not apparent, so leave them be.
30+
31+
* Configurations/DebugRelease.xcconfig:
32+
133
2020-10-12 Luming Yin <luming_yin@apple.com>
234

335
[macOS] Workaround for MAC_OS_X_VERSION_MAJOR incorrectly including minor version when building

0 commit comments

Comments
 (0)