Skip to content

Commit b2ec43e

Browse files
author
Truitt Savell
committed
Unreviewed, rolling out r240124.
This commit broke an internal build. Reverted changeset: "SDK_VARIANT build destinations should be separate from non- SDK_VARIANT builds" https://bugs.webkit.org/show_bug.cgi?id=189553 https://trac.webkit.org/changeset/240124 Canonical link: https://commits.webkit.org/208063@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240136 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 3658f2f commit b2ec43e

61 files changed

Lines changed: 318 additions & 1055 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2019-01-17 Truitt Savell <tsavell@apple.com>
2+
3+
Unreviewed, rolling out r240124.
4+
5+
This commit broke an internal build.
6+
7+
Reverted changeset:
8+
9+
"SDK_VARIANT build destinations should be separate from non-
10+
SDK_VARIANT builds"
11+
https://bugs.webkit.org/show_bug.cgi?id=189553
12+
https://trac.webkit.org/changeset/240124
13+
114
2019-01-17 Jer Noble <jer.noble@apple.com>
215

316
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds

‎Makefile.shared‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ ifneq (,$(ARCHS))
3434
endif
3535
endif
3636

37-
ifneq (,$(SDK_VARIANT))
38-
XCODE_OPTIONS += SDK_VARIANT="$(SDK_VARIANT)"
37+
ifeq (iosmac,$(SDK_VARIANT))
38+
XCODE_OPTIONS += SDK_VARIANT=iosmac
39+
XCODE_OPTIONS += WK_ALTERNATE_FRAMEWORKS_DIR=/System/iOSSupport
3940
endif
4041

4142
DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")

‎PerformanceTests/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2019-01-17 Truitt Savell <tsavell@apple.com>
2+
3+
Unreviewed, rolling out r240124.
4+
5+
This commit broke an internal build.
6+
7+
Reverted changeset:
8+
9+
"SDK_VARIANT build destinations should be separate from non-
10+
SDK_VARIANT builds"
11+
https://bugs.webkit.org/show_bug.cgi?id=189553
12+
https://trac.webkit.org/changeset/240124
13+
114
2019-01-17 Jer Noble <jer.noble@apple.com>
215

316
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds

‎PerformanceTests/MediaTime/Configurations/Base.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
25-
#include "SDKVariant.xcconfig"
2625

2726
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
2827
USE_INTERNAL_SDK_Production = YES;

‎PerformanceTests/MediaTime/Configurations/SDKVariant.xcconfig‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2019-01-17 Truitt Savell <tsavell@apple.com>
2+
3+
Unreviewed, rolling out r240124.
4+
5+
This commit broke an internal build.
6+
7+
Reverted changeset:
8+
9+
"SDK_VARIANT build destinations should be separate from non-
10+
SDK_VARIANT builds"
11+
https://bugs.webkit.org/show_bug.cgi?id=189553
12+
https://trac.webkit.org/changeset/240124
13+
114
2019-01-17 Jer Noble <jer.noble@apple.com>
215

316
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds

‎Source/JavaScriptCore/Configurations/Base.xcconfig‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
25-
#include "SDKVariant.xcconfig"
2625

2726
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
2827
USE_INTERNAL_SDK_Production = YES;
@@ -152,7 +151,12 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
152151
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
153152
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
154153

154+
WK_EMPTY_ = YES;
155+
WK_NOT_ = YES;
156+
WK_NOT_YES = NO;
157+
155158
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
159+
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
156160

157161
WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
158162
WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
@@ -163,6 +167,13 @@ WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRA
163167
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
164168
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
165169

170+
WK_ALTERNATE_WEBKIT_SDK_PATH = $(WK_ALTERNATE_WEBKIT_SDK_PATH_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
171+
WK_ALTERNATE_WEBKIT_SDK_PATH_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
172+
173+
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
174+
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
175+
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
176+
166177
WK_COCOA_TOUCH = $(WK_COCOA_TOUCH_$(WK_PLATFORM_NAME));
167178
WK_COCOA_TOUCH_iphoneos = cocoatouch;
168179
WK_COCOA_TOUCH_iosmac = cocoatouch;

‎Source/JavaScriptCore/Configurations/SDKVariant.xcconfig‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎Source/ThirdParty/ANGLE/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2019-01-17 Truitt Savell <tsavell@apple.com>
2+
3+
Unreviewed, rolling out r240124.
4+
5+
This commit broke an internal build.
6+
7+
Reverted changeset:
8+
9+
"SDK_VARIANT build destinations should be separate from non-
10+
SDK_VARIANT builds"
11+
https://bugs.webkit.org/show_bug.cgi?id=189553
12+
https://trac.webkit.org/changeset/240124
13+
114
2019-01-17 Jer Noble <jer.noble@apple.com>
215

316
SDK_VARIANT build destinations should be separate from non-SDK_VARIANT builds

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include? "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
2-
#include "SDKVariant.xcconfig"
32

43
CODE_SIGN_IDENTITY = -;
54

@@ -76,10 +75,20 @@ OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
7675
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
7776
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
7877

78+
WK_EMPTY_ = YES;
79+
WK_NOT_ = YES;
80+
WK_NOT_YES = NO;
81+
82+
WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
83+
7984
ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
8085
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
8186
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
8287

88+
WK_PLATFORM_NAME = $(WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
89+
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_YES = iosmac;
90+
WK_PLATFORM_NAME_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(PLATFORM_NAME);
91+
8392
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
8493
WK_LLVM_LTO_NO = NO;
8594
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);

0 commit comments

Comments
 (0)