diff options
| author | sbc <sbc@chromium.org> | 2015-07-22 13:12:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-22 20:13:34 +0000 |
| commit | 96018970d835da5af64f0fb666d8f5ed0ddec123 (patch) | |
| tree | 7e0281c06a1d07d6e2f332a12cd82a3ed650ca06 /build | |
| parent | 9f33b8a5eaebe8a245d8e6bb00baa6c52ba86905 (diff) | |
| download | chromium_src-96018970d835da5af64f0fb666d8f5ed0ddec123.zip chromium_src-96018970d835da5af64f0fb666d8f5ed0ddec123.tar.gz chromium_src-96018970d835da5af64f0fb666d8f5ed0ddec123.tar.bz2 | |
Use standard location for default mips linux sysroot
The mips sysroot is automatically installed in this
location by gclient hooks (install-debian.wheezy.sysroot.py).
Expect mipsel-linux-gcc to be in the PATH rather than
finding it relative to the sysroot. This matches the
behaviour the arm linux cross compile.
Depends on this native_client change: https://codereview.chromium.org/1212573002
BUG=504471
TEST=build all with target_arch=mips
Review URL: https://codereview.chromium.org/1207323003
Cr-Commit-Position: refs/heads/master@{#339945}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index e5bc454..04a93bc 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -305,7 +305,7 @@ }], # OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0 ['OS=="linux" and target_arch=="mipsel"', { - 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot', + 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_mips-sysroot', }], ], }, @@ -2360,7 +2360,7 @@ }], # Enable brlapi by default for chromeos. - [ 'chromeos==1', { + ['chromeos==1', { 'use_brlapi%': 1, }], @@ -5969,8 +5969,8 @@ }], ['OS=="linux" and target_arch=="mipsel" and clang==0', { 'make_global_settings': [ - ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'], - ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'], + ['CC', '<!(which mipsel-linux-gnu-gcc)'], + ['CXX', '<!(which mipsel-linux-gnu-g++)'], ['CC.host', '<(host_cc)'], ['CXX.host', '<(host_cxx)'], ], |