Changeset 93515 in webkit
- Timestamp:
- Aug 22, 2011 10:49:24 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r93511 r93515 1 2011-08-22 Xianzhu Wang <wangxianzhu@chromium.org> 2 3 Pass --makeargs of build-webkit to chromium linux builder 4 https://bugs.webkit.org/show_bug.cgi?id=66361 5 6 Reviewed by Tony Chang. 7 8 * Scripts/build-webkit: 9 * Scripts/webkitdirs.pm: 10 (buildChromiumMakefile): 11 (buildChromium): 12 1 13 2011-08-22 Peter Beverloo <peter@chromium.org> 2 14 -
trunk/Tools/Scripts/build-webkit
r92792 r93515 579 579 # Chromium doesn't build by project directories. 580 580 @projects = (); 581 push @options, "--makeargs=" . $makeArgs if $makeArgs; 581 582 my $result = buildChromium($clean, @options); 582 583 exit exitStatus($result) if exitStatus($result); -
trunk/Tools/Scripts/webkitdirs.pm
r92244 r93515 1824 1824 } 1825 1825 1826 sub buildChromiumMakefile($$ )1827 { 1828 my ($target, $clean ) = @_;1826 sub buildChromiumMakefile($$@) 1827 { 1828 my ($target, $clean, @options) = @_; 1829 1829 if ($clean) { 1830 1830 return system qw(rm -rf out); … … 1832 1832 my $config = configuration(); 1833 1833 my $numCpus = numberOfCPUs(); 1834 my @command = ("make", "-fMakefile.chromium", "-j$numCpus", "BUILDTYPE=$config", $target); 1835 print join(" ", @command) . "\n"; 1836 return system @command; 1834 my $makeArgs; 1835 for (@options) { 1836 $makeArgs = $1 if /^--makeargs=(.*)/i; 1837 } 1838 $makeArgs = "-j$numCpus" if not $makeArgs; 1839 my $command = "make -fMakefile.chromium $makeArgs BUILDTYPE=$config $target"; 1840 print "$command\n"; 1841 return system $command; 1837 1842 } 1838 1843 … … 1895 1900 } elsif (isLinux()) { 1896 1901 # Linux build - build using make. 1897 $ result = buildChromiumMakefile("all", $clean);1902 $result = buildChromiumMakefile("all", $clean, @options); 1898 1903 } else { 1899 1904 print STDERR "This platform is not supported by chromium.\n";
Note: See TracChangeset
for help on using the changeset viewer.