diff options
Diffstat (limited to 'Tools/Scripts/webkitdirs.pm')
| -rwxr-xr-x | Tools/Scripts/webkitdirs.pm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index eda2b205f..a8c35571e 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -326,7 +326,9 @@ sub determineArchitecture sub determineNumberOfCPUs { return if defined $numberOfCPUs; - if (isLinux()) { + if (defined($ENV{NUMBER_OF_PROCESSORS})) { + $numberOfCPUs = $ENV{NUMBER_OF_PROCESSORS}; + } elsif (isLinux()) { # First try the nproc utility, if it exists. If we get no # results fall back to just interpretting /proc directly. chomp($numberOfCPUs = `nproc 2> /dev/null`); @@ -334,12 +336,8 @@ sub determineNumberOfCPUs $numberOfCPUs = (grep /processor/, `cat /proc/cpuinfo`); } } elsif (isWindows() || isCygwin()) { - if (defined($ENV{NUMBER_OF_PROCESSORS})) { - $numberOfCPUs = $ENV{NUMBER_OF_PROCESSORS}; - } else { - # Assumes cygwin - $numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`; - } + # Assumes cygwin + $numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`; } elsif (isDarwin()) { chomp($numberOfCPUs = `sysctl -n hw.ncpu`); } @@ -730,7 +728,7 @@ sub builtDylibPathForName return "NotFound"; } if (isEfl()) { - return "$configurationProductDir/Source/WebKit/libewebkit.so"; + return "$configurationProductDir/lib/libewebkit.so"; } if (isWinCE()) { return "$configurationProductDir/$libraryName"; @@ -2309,7 +2307,7 @@ sub buildChromiumNinja($$@) # rm -rf out requires rerunning gyp, so don't support --clean for now. my ($target, @options) = @_; my $config = configuration(); - my $makeArgs; + my $makeArgs = ""; for (@options) { $makeArgs = $1 if /^--makeargs=(.*)/i; } |