Title: [100253] trunk/Tools
Revision
100253
Author
hausm...@webkit.org
Date
2011-11-15 01:37:30 -0800 (Tue, 15 Nov 2011)

Log Message

[Qt] Unreviewed --minimal build fix.

* Scripts/build-webkit: Add to DEFINES+= from @options only if there is
a define. The "coverage" option doesn't have one, causing "DEFINES+= =0"
to make moc's preprocessor abort.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (100252 => 100253)


--- trunk/Tools/ChangeLog	2011-11-15 09:36:36 UTC (rev 100252)
+++ trunk/Tools/ChangeLog	2011-11-15 09:37:30 UTC (rev 100253)
@@ -1,3 +1,11 @@
+2011-11-15  Simon Hausmann  <simon.hausm...@nokia.com>
+
+        [Qt] Unreviewed --minimal build fix.
+
+        * Scripts/build-webkit: Add to DEFINES+= from @options only if there is
+        a define. The "coverage" option doesn't have one, causing "DEFINES+= =0"
+        to make moc's preprocessor abort.
+
 2011-11-14  Raphael Kubo da Costa  <k...@profusion.mobi>
 
         build-webkit: Accept --cmakearg to pass additional arguments to CMake.

Modified: trunk/Tools/Scripts/build-webkit (100252 => 100253)


--- trunk/Tools/Scripts/build-webkit	2011-11-15 09:36:36 UTC (rev 100252)
+++ trunk/Tools/Scripts/build-webkit	2011-11-15 09:37:30 UTC (rev 100253)
@@ -562,7 +562,7 @@
     @options = (@ARGV, @options);
 
     foreach (@features) {
-        push @options, "DEFINES+=$_->{define}=${$_->{value}}" if ${$_->{value}} != $_->{default};
+        push @options, "DEFINES+=$_->{define}=${$_->{value}}" if $_->{define} && ${$_->{value}} != $_->{default};
     }
 
     if ($minimal) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to