Title: [254262] trunk
Revision
254262
Author
commit-qu...@webkit.org
Date
2020-01-09 08:49:14 -0800 (Thu, 09 Jan 2020)

Log Message

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

Modified Paths

Diff

Modified: trunk/ChangeLog (254261 => 254262)


--- trunk/ChangeLog	2020-01-09 16:47:56 UTC (rev 254261)
+++ trunk/ChangeLog	2020-01-09 16:49:14 UTC (rev 254262)
@@ -1,3 +1,17 @@
+2020-01-09  Commit Queue  <commit-qu...@webkit.org>
+
+        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
+
 2020-01-08  Saam Barati  <sbar...@apple.com>
 
         build-jsc should invoke make instead of calling xcodebuild directly

Modified: trunk/Makefile.shared (254261 => 254262)


--- trunk/Makefile.shared	2020-01-09 16:47:56 UTC (rev 254261)
+++ trunk/Makefile.shared	2020-01-09 16:49:14 UTC (rev 254262)
@@ -1,7 +1,7 @@
 SCRIPTS_PATH ?= ../Tools/Scripts
 
 SET_COLOR_DIAGNOSTICS_ARG = if [[ -t 1 ]]; then COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; fi
-XCODE_OPTIONS += `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
 
 ifneq (,$(SDKROOT))
 	ifneq (,$(OVERRIDE_SDKROOT))

Modified: trunk/Source/_javascript_Core/ChangeLog (254261 => 254262)


--- trunk/Source/_javascript_Core/ChangeLog	2020-01-09 16:47:56 UTC (rev 254261)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-01-09 16:49:14 UTC (rev 254262)
@@ -1,3 +1,17 @@
+2020-01-09  Commit Queue  <commit-qu...@webkit.org>
+
+        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
+
 2020-01-08  Keith Miller  <keith_mil...@apple.com>
 
         [JSC] Introduce JSArrayIterator

Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (254261 => 254262)


--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2020-01-09 16:47:56 UTC (rev 254261)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2020-01-09 16:49:14 UTC (rev 254262)
@@ -2092,76 +2092,6 @@
 			remoteGlobalIDString = 65FB3F6609D11E9100F49DEB;
 			remoteInfo = "Derived Sources";
 		};
-		525D13D023C6936600452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13D223C6936B00452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13D423C6937000452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13D623C6937600452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13D823C6937B00452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13DA23C6938400452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13DC23C6938900452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13DE23C6939100452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13E023C6939700452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
-		525D13E223C6939B00452D6F /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 932F5B3E0822A1C700736975;
-			remoteInfo = _javascript_Core;
-		};
 		52CD0F652242F5A3004A18A5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -10473,7 +10403,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13DD23C6938900452D6F /* PBXTargetDependency */,
 				14CFB11323035F5800F0048C /* PBXTargetDependency */,
 			);
 			name = testair;
@@ -10491,7 +10420,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13DB23C6938400452D6F /* PBXTargetDependency */,
 				14CFB11123035F5300F0048C /* PBXTargetDependency */,
 			);
 			name = dynbench;
@@ -10509,7 +10437,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13D923C6937B00452D6F /* PBXTargetDependency */,
 				14CFB10F23035F4D00F0048C /* PBXTargetDependency */,
 			);
 			name = testb3;
@@ -10549,7 +10476,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13D123C6936600452D6F /* PBXTargetDependency */,
 				14CFB10023035EF300F0048C /* PBXTargetDependency */,
 			);
 			name = minidom;
@@ -10569,7 +10495,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13D323C6936B00452D6F /* PBXTargetDependency */,
 				14CFB10B23035F1A00F0048C /* PBXTargetDependency */,
 			);
 			name = testapi;
@@ -10607,7 +10532,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13E323C6939B00452D6F /* PBXTargetDependency */,
 				14CFB11923035F6900F0048C /* PBXTargetDependency */,
 			);
 			name = testdfg;
@@ -10625,7 +10549,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13D723C6937600452D6F /* PBXTargetDependency */,
 				14CFB10D23035F4600F0048C /* PBXTargetDependency */,
 			);
 			name = testRegExp;
@@ -10644,7 +10567,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13E123C6939700452D6F /* PBXTargetDependency */,
 				14CFB11723035F6300F0048C /* PBXTargetDependency */,
 			);
 			name = testmem;
@@ -10693,7 +10615,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13D523C6937000452D6F /* PBXTargetDependency */,
 				14D9D9DA218462B5009126C2 /* PBXTargetDependency */,
 			);
 			name = jsc;
@@ -10712,7 +10633,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				525D13DF23C6939100452D6F /* PBXTargetDependency */,
 				14CFB11523035F5E00F0048C /* PBXTargetDependency */,
 			);
 			name = testmasm;
@@ -10726,6 +10646,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Original;
 				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 1000;
@@ -11509,56 +11430,6 @@
 			target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
 			targetProxy = 14D9D9D9218462B5009126C2 /* PBXContainerItemProxy */;
 		};
-		525D13D123C6936600452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13D023C6936600452D6F /* PBXContainerItemProxy */;
-		};
-		525D13D323C6936B00452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13D223C6936B00452D6F /* PBXContainerItemProxy */;
-		};
-		525D13D523C6937000452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13D423C6937000452D6F /* PBXContainerItemProxy */;
-		};
-		525D13D723C6937600452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13D623C6937600452D6F /* PBXContainerItemProxy */;
-		};
-		525D13D923C6937B00452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13D823C6937B00452D6F /* PBXContainerItemProxy */;
-		};
-		525D13DB23C6938400452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13DA23C6938400452D6F /* PBXContainerItemProxy */;
-		};
-		525D13DD23C6938900452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13DC23C6938900452D6F /* PBXContainerItemProxy */;
-		};
-		525D13DF23C6939100452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13DE23C6939100452D6F /* PBXContainerItemProxy */;
-		};
-		525D13E123C6939700452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13E023C6939700452D6F /* PBXContainerItemProxy */;
-		};
-		525D13E323C6939B00452D6F /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 932F5B3E0822A1C700736975 /* _javascript_Core */;
-			targetProxy = 525D13E223C6939B00452D6F /* PBXContainerItemProxy */;
-		};
 		52CD0F662242F5A3004A18A5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 52CD0F592242F569004A18A5 /* testdfg */;

Modified: trunk/Source/_javascript_Core/Makefile (254261 => 254262)


--- trunk/Source/_javascript_Core/Makefile	2020-01-09 16:47:56 UTC (rev 254261)
+++ trunk/Source/_javascript_Core/Makefile	2020-01-09 16:49:14 UTC (rev 254262)
@@ -1,2 +1 @@
-XCODE_OPTIONS += -parallelizeTargets
 include ../Makefile.shared
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to