Title: [160372] trunk/Tools
- Revision
- 160372
- Author
- commit-qu...@webkit.org
- Date
- 2013-12-10 09:47:56 -0800 (Tue, 10 Dec 2013)
Log Message
Add --makeargs option to build-jsc
https://bugs.webkit.org/show_bug.cgi?id=125344
Patch by Laszlo Vidacs <l...@inf.u-szeged.hu> on 2013-12-10
Reviewed by Filip Pizlo.
* Scripts/build-jsc: Handle and pass makefile arguments in jsc build.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (160371 => 160372)
--- trunk/Tools/ChangeLog 2013-12-10 17:47:55 UTC (rev 160371)
+++ trunk/Tools/ChangeLog 2013-12-10 17:47:56 UTC (rev 160372)
@@ -1,3 +1,12 @@
+2013-12-10 Laszlo Vidacs <l...@inf.u-szeged.hu>
+
+ Add --makeargs option to build-jsc
+ https://bugs.webkit.org/show_bug.cgi?id=125344
+
+ Reviewed by Filip Pizlo.
+
+ * Scripts/build-jsc: Handle and pass makefile arguments in jsc build.
+
2013-12-10 Joanmarie Diggs <jdi...@igalia.com>
AX: [ATK] Convert the get_text atktest.c unit tests to layout tests
Modified: trunk/Tools/Scripts/build-jsc (160371 => 160372)
--- trunk/Tools/Scripts/build-jsc 2013-12-10 17:47:55 UTC (rev 160371)
+++ trunk/Tools/Scripts/build-jsc 2013-12-10 17:47:56 UTC (rev 160372)
@@ -39,6 +39,7 @@
my $showHelp = 0;
my $ftlJIT = 0;
my $forceCLoop = 0;
+my $makeArgs = "";
my $programName = basename($0);
my $usage = <<EOF;
@@ -47,13 +48,15 @@
--[no-]coverage Toggle code coverage support (default: $coverageSupport)
--[no-]ftl-jit Toggle FTL JIT support (default: $ftlJIT)
--cloop Use C Loop interpreter (default: $forceCLoop)
+ --makeargs=<arguments> Optional Makefile flags
EOF
GetOptions(
'coverage!' => \$coverageSupport,
'help' => \$showHelp,
'ftl-jit!' => \$ftlJIT,
- 'cloop!' => \$forceCLoop
+ 'cloop!' => \$forceCLoop,
+ 'makeargs=s' => \$makeArgs
);
if ($showHelp) {
@@ -70,9 +73,11 @@
if (cmakeBasedPortName()) {
my $cmakeArgs = "";
$cmakeArgs .= " -DENABLE_LLINT_C_LOOP=ON" if $forceCLoop;
+ # By default we build using all of the available CPUs
+ $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
# This call only returns if nothing wrong happened
- buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, "jsc", (cmakeBasedPortArguments(), $cmakeArgs));
+ buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, "jsc $makeArgs", (cmakeBasedPortArguments(), $cmakeArgs));
exit exitStatus(0);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
