diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 04:47:59 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 04:47:59 +0000 |
| commit | d55062ccd02782ac821fd523b60fb0d53bce5129 (patch) | |
| tree | b409230f09e3c3cfe9f23ddc8b7f8ace27d21aed | |
| parent | 3db02556a03168e6aa99b9f2c837bf138e872ec2 (diff) | |
| download | chromium_src-d55062ccd02782ac821fd523b60fb0d53bce5129.zip chromium_src-d55062ccd02782ac821fd523b60fb0d53bce5129.tar.gz chromium_src-d55062ccd02782ac821fd523b60fb0d53bce5129.tar.bz2 | |
Revert 109774 - Fix slash direction of strip command.
On Windows, the script incorrectly uses '/' regardless of OS. This causes
the build to fail. We do not modify the arguments because the strip tool
on windows is cygwin based and expects '/' (although it handles '\').
Review URL: http://codereview.chromium.org/8539042
TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8545001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109775 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/strip_nacl_irt.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/strip_nacl_irt.py b/chrome/strip_nacl_irt.py index 1dd9ab0..ac2a3d3 100644 --- a/chrome/strip_nacl_irt.py +++ b/chrome/strip_nacl_irt.py @@ -40,16 +40,14 @@ def StripIRT(platform, src, dst): }.get(sys.platform, 'linux') if platform in ['arm', 'arm-thumb2']: cmd = [ - os.path.join(SRC_DIR, 'native_client', 'toolchain', - 'pnacl_linux_x86_64_newlib', 'bin', - platform2 + '-strip'), + '../native_client/toolchain/pnacl_linux_x86_64_newlib/bin/' + + platform2 + '-strip', '--strip-debug', src, '-o', dst ] else: cmd = [ - os.path.join(SRC_DIR, 'native_client', 'toolchain', - cplatform + '_x86_newlib', 'bin', - platform2 + '-nacl-strip'), + '../native_client/toolchain/' + cplatform + '_x86_newlib/bin/' + + platform2 + '-nacl-strip', '--strip-debug', src, '-o', dst ] print 'Running: ' + ' '.join(cmd) |