summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorsbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 20:47:07 +0000
committersbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 20:47:07 +0000
commit266dd853e6fb718ccaf854a5bdc0888dfaae74e7 (patch)
treea0f8cd8436098b41abad83f5b7d9696a2a2dad38 /native_client_sdk
parentad486cb7b9fc5341ab1ef637f853e2e1d1a52a47 (diff)
downloadchromium_src-266dd853e6fb718ccaf854a5bdc0888dfaae74e7.zip
chromium_src-266dd853e6fb718ccaf854a5bdc0888dfaae74e7.tar.gz
chromium_src-266dd853e6fb718ccaf854a5bdc0888dfaae74e7.tar.bz2
[NaCl SDK] Pass 'clang=1' to gyp builds on mac
R=binji@chromium.org Review URL: https://codereview.chromium.org/101873006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238756 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/build_sdk.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 04ef246..e996e17 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -539,7 +539,9 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
if arch == 'arm':
gyp_defines += ['armv7=1', 'arm_thumb=0', 'arm_neon=1']
if force_arm_gcc:
- gyp_defines += ['nacl_enable_arm_gcc=1']
+ gyp_defines.append('nacl_enable_arm_gcc=1')
+ if getos.GetPlatform() == 'mac':
+ gyp_defines.append('clang=1')
gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines)
for key in ['GYP_GENERATORS', 'GYP_DEFINES']: