diff options
| author | petarj@mips.com <petarj@mips.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 11:41:53 +0000 |
|---|---|---|
| committer | petarj@mips.com <petarj@mips.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 11:41:53 +0000 |
| commit | 44bfa34f857455f9f433eb22dbe126f84bc77680 (patch) | |
| tree | 55a6c13fc0abe2db5d9393436bfe4db68812a909 /build/toolchain | |
| parent | 85a36cdcad50ad34cde38c7682184b524fcf6a3d (diff) | |
| download | chromium_src-44bfa34f857455f9f433eb22dbe126f84bc77680.zip chromium_src-44bfa34f857455f9f433eb22dbe126f84bc77680.tar.gz chromium_src-44bfa34f857455f9f433eb22dbe126f84bc77680.tar.bz2 | |
[MIPS] Set make_global_settings correctly for MIPS-Linux
Fix build regression for MIPS Linux that came with r245563.
BUG= build regression for MIPS Linux
TEST= build Chromium for MIPS Linux
Review URL: https://codereview.chromium.org/143963006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/toolchain')
| -rw-r--r-- | build/toolchain/linux/BUILD.gn | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn index 30dc022..74d287f 100644 --- a/build/toolchain/linux/BUILD.gn +++ b/build/toolchain/linux/BUILD.gn @@ -5,6 +5,7 @@ import("../clang.gni") import("../goma.gni") import("../gcc_toolchain.gni") +import("//build/config/sysroot.gni") if (is_gyp) { # Set the compilers for GYP to use. This logic is only relevant to GYP where @@ -15,7 +16,15 @@ if (is_gyp) { # Set the GYP header for all toolchains when running under Clang. make_global_settings = make_clang_global_settings } else { - make_global_settings = "" + if (cpu_arch == "mipsel") { + make_global_settings = + "['CC', '$sysroot/../bin/mipsel-linux-gnu-gcc']," + + "['CXX', '$sysroot/../bin/mipsel-linux-gnu-g++']," + + "['CC.host', '/usr/bin/gcc']," + + "['CXX.host', '/usr/bin/g++']," + } else { + make_global_settings = "" + } } if (use_goma) { |