diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 00:57:05 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 00:57:05 +0000 |
| commit | 472e0d97043acc16ac6cc770cda27b7a7b515136 (patch) | |
| tree | ab96eafeacbc17d6e6d6317f57652aec4a6d13eb /native_client_sdk | |
| parent | 1a5e6629514a7523ee2742054b111f86836a6ba6 (diff) | |
| download | chromium_src-472e0d97043acc16ac6cc770cda27b7a7b515136.zip chromium_src-472e0d97043acc16ac6cc770cda27b7a7b515136.tar.gz chromium_src-472e0d97043acc16ac6cc770cda27b7a7b515136.tar.bz2 | |
[NaCl SDK] Make ARM cross compiler optional until trybots get updated.
This change, combined with the recent revert of the SDK ARM
components on in the NaCl tree (https://codereview.chromium.org/141733005/)
should allow the SDK builders to go green again.
BUG=335303
R=binji@chromium.org
Review URL: https://codereview.chromium.org/132523006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index b03e0f5..6424993 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -537,12 +537,15 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, gyp_defines.append('target_arch=%s' % arch) if arch == 'arm': if getos.GetPlatform() == 'linux': - gyp_env['CC'] = 'arm-linux-gnueabihf-gcc' - gyp_env['CXX'] = 'arm-linux-gnueabihf-g++' - gyp_env['AR'] = 'arm-linux-gnueabihf-ar' - gyp_env['AS'] = 'arm-linux-gnueabihf-as' - gyp_env['CC_host'] = 'cc' - gyp_env['CXX_host'] = 'c++' + if os.path.exists("/usr/bin/arm-linux-gnueabihf-gcc"): + # TODO(sbc): make this conditional once all our linux + # have the ARM cross compiler installed. + gyp_env['CC'] = 'arm-linux-gnueabihf-gcc' + gyp_env['CXX'] = 'arm-linux-gnueabihf-g++' + gyp_env['AR'] = 'arm-linux-gnueabihf-ar' + gyp_env['AS'] = 'arm-linux-gnueabihf-as' + gyp_env['CC_host'] = 'cc' + gyp_env['CXX_host'] = 'c++' gyp_defines += ['armv7=1', 'arm_thumb=0', 'arm_neon=1', 'arm_float_abi=hard'] if force_arm_gcc: |