Title: [128305] trunk/Tools
- Revision
- 128305
- Author
- ves...@webkit.org
- Date
- 2012-09-12 07:11:01 -0700 (Wed, 12 Sep 2012)
Log Message
[Qt] Update build-jsc after r128174
Reviewed by Ossy.
* Scripts/build-jsc:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128304 => 128305)
--- trunk/Tools/ChangeLog 2012-09-12 14:10:42 UTC (rev 128304)
+++ trunk/Tools/ChangeLog 2012-09-12 14:11:01 UTC (rev 128305)
@@ -1,5 +1,13 @@
2012-09-12 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Update build-jsc after r128174
+
+ Reviewed by Ossy.
+
+ * Scripts/build-jsc:
+
+2012-09-12 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Teach addStrictSubdirOrderBetween to handle more than two targets
By hard-coding the names of the targets we defined we ended up just
Modified: trunk/Tools/Scripts/build-jsc (128304 => 128305)
--- trunk/Tools/Scripts/build-jsc 2012-09-12 14:10:42 UTC (rev 128304)
+++ trunk/Tools/Scripts/build-jsc 2012-09-12 14:11:01 UTC (rev 128305)
@@ -66,7 +66,7 @@
my @projects = ("WTF", "_javascript_Core");
# Pick up the --no-webkit2 option from BUILD_WEBKIT_ARGS if it is needed
push @ARGV, split(/ /, $ENV{'BUILD_WEBKIT_ARGS'}) if ($ENV{'BUILD_WEBKIT_ARGS'});
- push @ARGV, "--qmakearg=CONFIG+=no_webkit2" if checkForArgumentAndRemoveFromARGV("--no-webkit2");
+ push @ARGV, "WEBKIT_CONFIG-=build_webkit2" if checkForArgumentAndRemoveFromARGV("--no-webkit2");
my $result = buildQMakeProjects(\@projects, 0, @ARGV);
exit exitStatus($result);
} elsif (cmakeBasedPortName()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
