Skip to content

Commit f2fa546

Browse files
author
[email protected]
committed
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
https://bugs.webkit.org/show_bug.cgi?id=155707 <rdar://problem/24980691> Reviewed by Darin Adler. Source/bmalloc: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Source/JavaScriptCore: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Source/WebCore: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Source/WebInspectorUI: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Source/WebKit/mac: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Source/WebKit2: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Source/WTF: * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Tools: * ContentExtensionTester/Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET. * ContentExtensionTester/Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version. Similarly for these projects: * DumpRenderTree/mac/Configurations/Base.xcconfig: * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: * LayoutTestRelay/Configurations/Base.xcconfig: * LayoutTestRelay/Configurations/DebugRelease.xcconfig: * MiniBrowser/Configurations/Base.xcconfig: * MiniBrowser/Configurations/DebugRelease.xcconfig: * TestWebKitAPI/Configurations/Base.xcconfig: * TestWebKitAPI/Configurations/DebugRelease.xcconfig: * WebEditingTester/Configurations/Base.xcconfig: * WebEditingTester/Configurations/DebugRelease.xcconfig: * WebKitTestRunner/Configurations/Base.xcconfig: * WebKitTestRunner/Configurations/DebugRelease.xcconfig: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@198481 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent fb75ba8 commit f2fa546

File tree

39 files changed

+237
-17
lines changed

39 files changed

+237
-17
lines changed

‎Source/JavaScriptCore/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Michael Saboff <[email protected]>
215

316
Crash in stress/regexp-matches-array-slow-put.js due to stomping on memory when having bad time

‎Source/JavaScriptCore/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ LLVM_SYSTEM_HEADER_PATH[sdk=iphoneos*] = /usr/local/include;
8888

8989
HEADER_SEARCH_PATHS = . icu $(LLVM_LOCAL_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild" $(LLVM_SYSTEM_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
9090

91-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
91+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
92+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
93+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
94+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
95+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
9296

9397
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
9498

‎Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727

2828
ONLY_ACTIVE_ARCH = YES;
2929

30+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
31+
3032
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
3133
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3234
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Source/ThirdParty/ANGLE/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Dan Bernstein <[email protected]>
215

316
Update build settings

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ STRIP_INSTALLED_PRODUCT = NO;
4545

4646
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
4747

48-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
48+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
49+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
50+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
51+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
52+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
4953

5054
SDKROOT = macosx.internal;
5155

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

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
44

55
ONLY_ACTIVE_ARCH = YES;
66

7+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
8+
79
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
810
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
911
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Source/WTF/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Dan Bernstein <[email protected]>
215

316
Update build settings

‎Source/WTF/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ PREBINDING = NO;
8282
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
8383
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
8484

85-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
85+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
86+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
87+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
88+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
89+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
8690

8791
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
8892

‎Source/WTF/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727
ONLY_ACTIVE_ARCH = YES;
2828

29+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
30+
2931
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
3032
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3133
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Source/WebCore/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Konstantin Tokarev <[email protected]>
215

316
Added implementations of AXObjectCache methods for !HAVE(ACCESSIBILITY).

‎Source/WebCore/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ GCC_WARN_UNUSED_VARIABLE = YES;
7979
PREBINDING = NO;
8080
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
8181

82-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
82+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
83+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
84+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
85+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
86+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
8387

8488
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
8589

‎Source/WebCore/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727

2828
ONLY_ACTIVE_ARCH = YES;
2929

30+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
31+
3032
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
3133
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3234
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Source/WebInspectorUI/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Dan Bernstein <[email protected]>
215

316
Update build settings

‎Source/WebInspectorUI/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ ENGINEERING_BUILD_DEFINES_1 = ENGINEERING_BUILD=1;
5353

5454
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
5555

56-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
56+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
57+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
58+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
59+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
60+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
5761

5862
SDKROOT = macosx.internal;
5963

‎Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
44

55
ONLY_ACTIVE_ARCH = YES;
66

7+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
8+
79
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
810
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
911
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Source/WebKit/mac/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Darin Adler <[email protected]>
215

316
Disable Caches in Safari's Develop menu does not disable caches.

‎Source/WebKit/mac/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
7373
PREBINDING = NO;
7474
WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
7575

76-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
76+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
77+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
78+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
79+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
80+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
7781

7882

7983
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.

‎Source/WebKit/mac/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727

2828
ONLY_ACTIVE_ARCH = YES;
2929

30+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
31+
3032
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
3133
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3234
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Source/WebKit2/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Darin Adler <[email protected]>
215

316
Disable Caches in Safari's Develop menu does not disable caches.

‎Source/WebKit2/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
7373
PREBINDING = NO;
7474
WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
7575

76-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
76+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
77+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
78+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
79+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
80+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
7781

7882
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
7983
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.

‎Source/WebKit2/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727

2828
ONLY_ACTIVE_ARCH = YES;
2929

30+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
31+
3032
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
3133
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3234
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Source/bmalloc/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
10+
component of MACOSX_DEPLOYMENT_TARGET.
11+
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
12+
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
114
2016-03-20 Dan Bernstein <[email protected]>
215

316
Update build settings

‎Source/bmalloc/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ GCC_WARN_UNUSED_VARIABLE = YES;
8080
PREBINDING = NO;
8181
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
8282

83-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
83+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
84+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
85+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
86+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
87+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
8488

8589
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
8690

‎Source/bmalloc/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727
ONLY_ACTIVE_ARCH = YES;
2828

29+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
30+
2931
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
3032
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3133
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

‎Tools/ChangeLog

+28
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
2016-03-20 Dan Bernstein <[email protected]>
2+
3+
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
4+
https://bugs.webkit.org/show_bug.cgi?id=155707
5+
<rdar://problem/24980691>
6+
7+
Reviewed by Darin Adler.
8+
9+
* ContentExtensionTester/Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR
10+
based on the last component of MACOSX_DEPLOYMENT_TARGET.
11+
* ContentExtensionTester/Configurations/DebugRelease.xcconfig: For engineering builds,
12+
preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
13+
14+
Similarly for these projects:
15+
16+
* DumpRenderTree/mac/Configurations/Base.xcconfig:
17+
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
18+
* LayoutTestRelay/Configurations/Base.xcconfig:
19+
* LayoutTestRelay/Configurations/DebugRelease.xcconfig:
20+
* MiniBrowser/Configurations/Base.xcconfig:
21+
* MiniBrowser/Configurations/DebugRelease.xcconfig:
22+
* TestWebKitAPI/Configurations/Base.xcconfig:
23+
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
24+
* WebEditingTester/Configurations/Base.xcconfig:
25+
* WebEditingTester/Configurations/DebugRelease.xcconfig:
26+
* WebKitTestRunner/Configurations/Base.xcconfig:
27+
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
28+
129
2016-03-20 Dan Bernstein <[email protected]>
230

331
Update build settings

‎Tools/ContentExtensionTester/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ GCC_WARN_UNUSED_FUNCTION = YES;
6565
GCC_WARN_UNUSED_VARIABLE = YES;
6666
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
6767

68-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
68+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
69+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
70+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
71+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
72+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
6973

7074
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
7175
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.

‎Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525

2626
ONLY_ACTIVE_ARCH = YES;
2727

28+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
29+
2830
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
29-
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
3031
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3132
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
3233
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;

‎Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

+5-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ DEBUG_DEFINES_debug = ;
6969
DEBUG_DEFINES_normal = NDEBUG;
7070
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
7171

72-
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
72+
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
73+
TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
74+
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
75+
TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
76+
TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
7377

7478
SDKROOT = macosx.internal;
7579

‎Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
2727

2828
ONLY_ACTIVE_ARCH = YES;
2929

30+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
31+
3032
MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
3133
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3234
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

0 commit comments

Comments
 (0)