Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit a90d398

Browse files
author
[email protected]
committed
Unreviewed, rolling out r254234.
https://bugs.webkit.org/show_bug.cgi?id=206011 Broke production builds (Requested by ap on #webkit). Reverted changeset: "build-jsc should invoke make instead of calling xcodebuild directly" https://bugs.webkit.org/show_bug.cgi?id=205960 https://trac.webkit.org/changeset/254234 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254262 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 215a478 commit a90d398

File tree

5 files changed

+30
-132
lines changed

5 files changed

+30
-132
lines changed

‎ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2020-01-09 Commit Queue <[email protected]>
2+
3+
Unreviewed, rolling out r254234.
4+
https://bugs.webkit.org/show_bug.cgi?id=206011
5+
6+
Broke production builds (Requested by ap on #webkit).
7+
8+
Reverted changeset:
9+
10+
"build-jsc should invoke make instead of calling xcodebuild
11+
directly"
12+
https://bugs.webkit.org/show_bug.cgi?id=205960
13+
https://trac.webkit.org/changeset/254234
14+
115
2020-01-08 Saam Barati <[email protected]>
216

317
build-jsc should invoke make instead of calling xcodebuild directly

‎Makefile.shared

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SCRIPTS_PATH ?= ../Tools/Scripts
22

33
SET_COLOR_DIAGNOSTICS_ARG = if [[ -t 1 ]]; then COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; fi
4-
XCODE_OPTIONS += `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
4+
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
55

66
ifneq (,$(SDKROOT))
77
ifneq (,$(OVERRIDE_SDKROOT))

‎Source/JavaScriptCore/ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2020-01-09 Commit Queue <[email protected]>
2+
3+
Unreviewed, rolling out r254234.
4+
https://bugs.webkit.org/show_bug.cgi?id=206011
5+
6+
Broke production builds (Requested by ap on #webkit).
7+
8+
Reverted changeset:
9+
10+
"build-jsc should invoke make instead of calling xcodebuild
11+
directly"
12+
https://bugs.webkit.org/show_bug.cgi?id=205960
13+
https://trac.webkit.org/changeset/254234
14+
115
2020-01-08 Keith Miller <[email protected]>
216

317
[JSC] Introduce JSArrayIterator

‎Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Lines changed: 1 addition & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,76 +2092,6 @@
20922092
remoteGlobalIDString = 65FB3F6609D11E9100F49DEB;
20932093
remoteInfo = "Derived Sources";
20942094
};
2095-
525D13D023C6936600452D6F /* PBXContainerItemProxy */ = {
2096-
isa = PBXContainerItemProxy;
2097-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2098-
proxyType = 1;
2099-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2100-
remoteInfo = JavaScriptCore;
2101-
};
2102-
525D13D223C6936B00452D6F /* PBXContainerItemProxy */ = {
2103-
isa = PBXContainerItemProxy;
2104-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2105-
proxyType = 1;
2106-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2107-
remoteInfo = JavaScriptCore;
2108-
};
2109-
525D13D423C6937000452D6F /* PBXContainerItemProxy */ = {
2110-
isa = PBXContainerItemProxy;
2111-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2112-
proxyType = 1;
2113-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2114-
remoteInfo = JavaScriptCore;
2115-
};
2116-
525D13D623C6937600452D6F /* PBXContainerItemProxy */ = {
2117-
isa = PBXContainerItemProxy;
2118-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2119-
proxyType = 1;
2120-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2121-
remoteInfo = JavaScriptCore;
2122-
};
2123-
525D13D823C6937B00452D6F /* PBXContainerItemProxy */ = {
2124-
isa = PBXContainerItemProxy;
2125-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2126-
proxyType = 1;
2127-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2128-
remoteInfo = JavaScriptCore;
2129-
};
2130-
525D13DA23C6938400452D6F /* PBXContainerItemProxy */ = {
2131-
isa = PBXContainerItemProxy;
2132-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2133-
proxyType = 1;
2134-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2135-
remoteInfo = JavaScriptCore;
2136-
};
2137-
525D13DC23C6938900452D6F /* PBXContainerItemProxy */ = {
2138-
isa = PBXContainerItemProxy;
2139-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2140-
proxyType = 1;
2141-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2142-
remoteInfo = JavaScriptCore;
2143-
};
2144-
525D13DE23C6939100452D6F /* PBXContainerItemProxy */ = {
2145-
isa = PBXContainerItemProxy;
2146-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2147-
proxyType = 1;
2148-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2149-
remoteInfo = JavaScriptCore;
2150-
};
2151-
525D13E023C6939700452D6F /* PBXContainerItemProxy */ = {
2152-
isa = PBXContainerItemProxy;
2153-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2154-
proxyType = 1;
2155-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2156-
remoteInfo = JavaScriptCore;
2157-
};
2158-
525D13E223C6939B00452D6F /* PBXContainerItemProxy */ = {
2159-
isa = PBXContainerItemProxy;
2160-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2161-
proxyType = 1;
2162-
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2163-
remoteInfo = JavaScriptCore;
2164-
};
21652095
52CD0F652242F5A3004A18A5 /* PBXContainerItemProxy */ = {
21662096
isa = PBXContainerItemProxy;
21672097
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -10473,7 +10403,6 @@
1047310403
buildRules = (
1047410404
);
1047510405
dependencies = (
10476-
525D13DD23C6938900452D6F /* PBXTargetDependency */,
1047710406
14CFB11323035F5800F0048C /* PBXTargetDependency */,
1047810407
);
1047910408
name = testair;
@@ -10491,7 +10420,6 @@
1049110420
buildRules = (
1049210421
);
1049310422
dependencies = (
10494-
525D13DB23C6938400452D6F /* PBXTargetDependency */,
1049510423
14CFB11123035F5300F0048C /* PBXTargetDependency */,
1049610424
);
1049710425
name = dynbench;
@@ -10509,7 +10437,6 @@
1050910437
buildRules = (
1051010438
);
1051110439
dependencies = (
10512-
525D13D923C6937B00452D6F /* PBXTargetDependency */,
1051310440
14CFB10F23035F4D00F0048C /* PBXTargetDependency */,
1051410441
);
1051510442
name = testb3;
@@ -10549,7 +10476,6 @@
1054910476
buildRules = (
1055010477
);
1055110478
dependencies = (
10552-
525D13D123C6936600452D6F /* PBXTargetDependency */,
1055310479
14CFB10023035EF300F0048C /* PBXTargetDependency */,
1055410480
);
1055510481
name = minidom;
@@ -10569,7 +10495,6 @@
1056910495
buildRules = (
1057010496
);
1057110497
dependencies = (
10572-
525D13D323C6936B00452D6F /* PBXTargetDependency */,
1057310498
14CFB10B23035F1A00F0048C /* PBXTargetDependency */,
1057410499
);
1057510500
name = testapi;
@@ -10607,7 +10532,6 @@
1060710532
buildRules = (
1060810533
);
1060910534
dependencies = (
10610-
525D13E323C6939B00452D6F /* PBXTargetDependency */,
1061110535
14CFB11923035F6900F0048C /* PBXTargetDependency */,
1061210536
);
1061310537
name = testdfg;
@@ -10625,7 +10549,6 @@
1062510549
buildRules = (
1062610550
);
1062710551
dependencies = (
10628-
525D13D723C6937600452D6F /* PBXTargetDependency */,
1062910552
14CFB10D23035F4600F0048C /* PBXTargetDependency */,
1063010553
);
1063110554
name = testRegExp;
@@ -10644,7 +10567,6 @@
1064410567
buildRules = (
1064510568
);
1064610569
dependencies = (
10647-
525D13E123C6939700452D6F /* PBXTargetDependency */,
1064810570
14CFB11723035F6300F0048C /* PBXTargetDependency */,
1064910571
);
1065010572
name = testmem;
@@ -10693,7 +10615,6 @@
1069310615
buildRules = (
1069410616
);
1069510617
dependencies = (
10696-
525D13D523C6937000452D6F /* PBXTargetDependency */,
1069710618
14D9D9DA218462B5009126C2 /* PBXTargetDependency */,
1069810619
);
1069910620
name = jsc;
@@ -10712,7 +10633,6 @@
1071210633
buildRules = (
1071310634
);
1071410635
dependencies = (
10715-
525D13DF23C6939100452D6F /* PBXTargetDependency */,
1071610636
14CFB11523035F5E00F0048C /* PBXTargetDependency */,
1071710637
);
1071810638
name = testmasm;
@@ -10726,6 +10646,7 @@
1072610646
0867D690FE84028FC02AAC07 /* Project object */ = {
1072710647
isa = PBXProject;
1072810648
attributes = {
10649+
BuildIndependentTargetsInParallel = YES;
1072910650
DefaultBuildSystemTypeForWorkspace = Original;
1073010651
LastSwiftUpdateCheck = 0700;
1073110652
LastUpgradeCheck = 1000;
@@ -11509,56 +11430,6 @@
1150911430
target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
1151011431
targetProxy = 14D9D9D9218462B5009126C2 /* PBXContainerItemProxy */;
1151111432
};
11512-
525D13D123C6936600452D6F /* PBXTargetDependency */ = {
11513-
isa = PBXTargetDependency;
11514-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11515-
targetProxy = 525D13D023C6936600452D6F /* PBXContainerItemProxy */;
11516-
};
11517-
525D13D323C6936B00452D6F /* PBXTargetDependency */ = {
11518-
isa = PBXTargetDependency;
11519-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11520-
targetProxy = 525D13D223C6936B00452D6F /* PBXContainerItemProxy */;
11521-
};
11522-
525D13D523C6937000452D6F /* PBXTargetDependency */ = {
11523-
isa = PBXTargetDependency;
11524-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11525-
targetProxy = 525D13D423C6937000452D6F /* PBXContainerItemProxy */;
11526-
};
11527-
525D13D723C6937600452D6F /* PBXTargetDependency */ = {
11528-
isa = PBXTargetDependency;
11529-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11530-
targetProxy = 525D13D623C6937600452D6F /* PBXContainerItemProxy */;
11531-
};
11532-
525D13D923C6937B00452D6F /* PBXTargetDependency */ = {
11533-
isa = PBXTargetDependency;
11534-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11535-
targetProxy = 525D13D823C6937B00452D6F /* PBXContainerItemProxy */;
11536-
};
11537-
525D13DB23C6938400452D6F /* PBXTargetDependency */ = {
11538-
isa = PBXTargetDependency;
11539-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11540-
targetProxy = 525D13DA23C6938400452D6F /* PBXContainerItemProxy */;
11541-
};
11542-
525D13DD23C6938900452D6F /* PBXTargetDependency */ = {
11543-
isa = PBXTargetDependency;
11544-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11545-
targetProxy = 525D13DC23C6938900452D6F /* PBXContainerItemProxy */;
11546-
};
11547-
525D13DF23C6939100452D6F /* PBXTargetDependency */ = {
11548-
isa = PBXTargetDependency;
11549-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11550-
targetProxy = 525D13DE23C6939100452D6F /* PBXContainerItemProxy */;
11551-
};
11552-
525D13E123C6939700452D6F /* PBXTargetDependency */ = {
11553-
isa = PBXTargetDependency;
11554-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11555-
targetProxy = 525D13E023C6939700452D6F /* PBXContainerItemProxy */;
11556-
};
11557-
525D13E323C6939B00452D6F /* PBXTargetDependency */ = {
11558-
isa = PBXTargetDependency;
11559-
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11560-
targetProxy = 525D13E223C6939B00452D6F /* PBXContainerItemProxy */;
11561-
};
1156211433
52CD0F662242F5A3004A18A5 /* PBXTargetDependency */ = {
1156311434
isa = PBXTargetDependency;
1156411435
target = 52CD0F592242F569004A18A5 /* testdfg */;

‎Source/JavaScriptCore/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
XCODE_OPTIONS += -parallelizeTargets
21
include ../Makefile.shared

0 commit comments

Comments
 (0)