Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 80acde7e7605534868b5204dce1ec08bc15ac329..90441afa2eca099b7985d820e1c130f73d3918c2 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -614,6 +614,10 @@ |
| # incorrect results when passed to pkg-config |
| 'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot', |
| }], # OS=="linux" and target_arch=="arm" and chromeos==0 |
| + |
| + ['target_arch=="mipsel"', { |
| + 'sysroot': '<!(cd <(DEPTH) && pwd -P)/native_client/toolchain/linux_mips-trusted/sysroot', |
| + }], # target_arch=="mipsel" |
|
tony
2013/01/31 01:13:09
Nit: I would remove the comment here. I'm not sur
petarj
2013/01/31 01:19:23
Done.
|
| ], |
| # Set this to 1 to use the Google-internal file containing |
| @@ -1031,6 +1035,17 @@ |
| }, { |
| 'gcc_version%': 0, |
| }], |
| + ['target_arch=="mipsel"', { |
| + # Set some defaults for mips/linux chrome builds |
|
tony
2013/01/31 01:13:09
I would remove this comment too. I don't see anyt
petarj
2013/01/31 01:19:23
Done.
|
| + 'werror%': '', |
| + 'disable_nacl%': 1, |
| + 'linux_use_gold_binary%': 0, |
| + 'linux_use_gold_flags%': 0, |
| + 'nacl_untrusted_build%': 0, |
| + 'linux_use_tcmalloc%': 0, |
| + 'linux_breakpad%': 0, |
| + 'sysroot%': '<(sysroot)', |
| + }], |
| # All Chrome builds have breakpad symbols, but only process the |
| # symbols from official builds. |
| ['(branding=="Chrome" and buildtype=="Official")', { |
| @@ -1296,8 +1311,9 @@ |
| 'use_cups%': 0, |
| }], |
| - # Native Client glibc toolchain is enabled by default except on arm. |
| - ['target_arch=="arm"', { |
| + # Native Client glibc toolchain is enabled |
| + # by default except on arm and mips. |
| + ['target_arch=="arm" or target_arch=="mipsel"', { |
| 'disable_glibc%': 1, |
| }, { |
| 'disable_glibc%': 0, |
| @@ -3937,6 +3953,16 @@ |
| ['LINK.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'], |
| ], |
| }], |
| + ['target_arch=="mipsel"', { |
| + 'make_global_settings': [ |
| + ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'], |
| + ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'], |
| + ['LINK', '$(CXX)'], |
| + ['CC.host', '<!(which gcc)'], |
| + ['CXX.host', '<!(which g++)'], |
| + ['LINK.host', '<!(which g++)'], |
| + ], |
| + }], |
| ], |
| 'xcode_settings': { |
| # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! |