Title: [260917] trunk/Tools
- Revision
- 260917
- Author
- [email protected]
- Date
- 2020-04-29 14:57:41 -0700 (Wed, 29 Apr 2020)
Log Message
build-jsc should quote the value of compile flags it forwards
https://bugs.webkit.org/show_bug.cgi?id=211204
Reviewed by Mark Lam.
We should quote outgoing compile flags that have an equal in them. Before,
if build-jsc were invoked like:
$ build-jsc --release ARCHS="x86_64 i386"
It'd invoke make like:
$ make release ARCHS=x86_64 i386
leading us to try to build the "i386" target, which doesn't exist.
This patch makes us invoke make like so:
$ make release ARCHS="x86_64 i386"
* Scripts/build-jsc:
(buildMyProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (260916 => 260917)
--- trunk/Tools/ChangeLog 2020-04-29 21:43:37 UTC (rev 260916)
+++ trunk/Tools/ChangeLog 2020-04-29 21:57:41 UTC (rev 260917)
@@ -1,3 +1,23 @@
+2020-04-29 Saam Barati <[email protected]>
+
+ build-jsc should quote the value of compile flags it forwards
+ https://bugs.webkit.org/show_bug.cgi?id=211204
+
+ Reviewed by Mark Lam.
+
+ We should quote outgoing compile flags that have an equal in them. Before,
+ if build-jsc were invoked like:
+ $ build-jsc --release ARCHS="x86_64 i386"
+ It'd invoke make like:
+ $ make release ARCHS=x86_64 i386
+ leading us to try to build the "i386" target, which doesn't exist.
+
+ This patch makes us invoke make like so:
+ $ make release ARCHS="x86_64 i386"
+
+ * Scripts/build-jsc:
+ (buildMyProject):
+
2020-04-29 Alex Christensen <[email protected]>
Add WKNavigationDelegate API shouldAllowDeprecatedTLS
Modified: trunk/Tools/Scripts/build-jsc (260916 => 260917)
--- trunk/Tools/Scripts/build-jsc 2020-04-29 21:43:37 UTC (rev 260916)
+++ trunk/Tools/Scripts/build-jsc 2020-04-29 21:57:41 UTC (rev 260917)
@@ -214,8 +214,20 @@
}
$compilerFlags .= '"';
- my $command = "make " . (lc configuration()) . " " . $compilerFlags . " " . join(" ", @ARGV);
+ my $extraCommands = "";
+ foreach (@ARGV) {
+ # Ensure that if somebody passes in a flag like `ARCHS="i386 x86_64"` we
+ # maintain the quotes around "i386 x86_64".
+ my $arg = $_;
+ if ($arg =~ m/=/) {
+ $arg =~ s/=/="/;
+ $arg = $arg . "\"";
+ }
+ $extraCommands .= " " . $arg;
+ }
+ my $command = "make " . (lc configuration()) . " " . $compilerFlags . " " . $extraCommands;
+
print "\n";
print "building ", $projectName, "\n";
print "running build command '", $command, "' in ", $projectDirectory, "\n\n";
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
