diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 19:12:57 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 19:12:57 +0000 |
| commit | c759f847853ad04935b4ac7f44adae91a9a144f6 (patch) | |
| tree | d5ac04845cf476acbd9d07787cc186980deed2b5 /native_client_sdk | |
| parent | 47b7c9a10ebc81548d70b3c266fdaad1c4f29946 (diff) | |
| download | chromium_src-c759f847853ad04935b4ac7f44adae91a9a144f6.zip chromium_src-c759f847853ad04935b4ac7f44adae91a9a144f6.tar.gz chromium_src-c759f847853ad04935b4ac7f44adae91a9a144f6.tar.bz2 | |
[NaCl SDK] Make runs in parallel on linux/mac.
subprocess.call(args, shell=True) will run /bin/sh -c arg[0], arg[1], ...
which runs arg[0], but doesn't pass arg[1]... to it on the commandline. Of
course, this works as expected on Windows...
Remove usage of shell=True.
BUG=none
TBR=noelallen@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11040017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 6eff0a3..dce130d 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -692,15 +692,17 @@ def BuildStepMakeAll(pepperdir, platform, directory, step_name, clean=False): if platform == 'win': # We need to modify the environment to build host on Windows. env = GetWindowsEnvironment() + make = os.path.join(make_dir, 'make.bat') else: env = os.environ + make = 'make' - buildbot_common.Run(['make', '-j8'], - cwd=os.path.abspath(make_dir), shell=True, env=env) + buildbot_common.Run([make, '-j8'], + cwd=os.path.abspath(make_dir), env=env) if clean: # Clean to remove temporary files but keep the built libraries. - buildbot_common.Run(['make', '-j8', 'clean'], - cwd=os.path.abspath(make_dir), shell=True) + buildbot_common.Run([make, '-j8', 'clean'], + cwd=os.path.abspath(make_dir)) def BuildStepBuildLibraries(pepperdir, platform, directory): |