Commit dd6b50cf authored by sbc@chromium.org's avatar sbc@chromium.org

[NaCl SDK] Set ARM cross compiler with building ARM components using gyp.

R=noelallen@chromium.org

Review URL: https://codereview.chromium.org/131853012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255712 0039d316-1c4b-4281-b951-d872f2087c98
parent 6238b450
...@@ -542,15 +542,12 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, ...@@ -542,15 +542,12 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
gyp_defines.append('target_arch=%s' % arch) gyp_defines.append('target_arch=%s' % arch)
if arch == 'arm': if arch == 'arm':
if getos.GetPlatform() == 'linux': if getos.GetPlatform() == 'linux':
if os.path.exists("/usr/bin/arm-linux-gnueabihf-gcc"): gyp_env['CC'] = 'arm-linux-gnueabihf-gcc'
# TODO(sbc): make this conditional once all our linux gyp_env['CXX'] = 'arm-linux-gnueabihf-g++'
# have the ARM cross compiler installed. gyp_env['AR'] = 'arm-linux-gnueabihf-ar'
gyp_env['CC'] = 'arm-linux-gnueabihf-gcc' gyp_env['AS'] = 'arm-linux-gnueabihf-as'
gyp_env['CXX'] = 'arm-linux-gnueabihf-g++' gyp_env['CC_host'] = 'cc'
gyp_env['AR'] = 'arm-linux-gnueabihf-ar' gyp_env['CXX_host'] = 'c++'
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', gyp_defines += ['armv7=1', 'arm_thumb=0', 'arm_neon=1',
'arm_float_abi=hard'] 'arm_float_abi=hard']
if force_arm_gcc: if force_arm_gcc:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment