diff options
| author | dschuff <dschuff@chromium.org> | 2015-08-26 23:21:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 06:21:59 +0000 |
| commit | a6328ec1abececdb6ba1c0b32d9c06214d64a84e (patch) | |
| tree | 37492d3c96ce6f98166d83ec6d8146fec9fcca1e /native_client_sdk | |
| parent | 4efd31c9eba52fb6efc5348712f2135affa94463 (diff) | |
| download | chromium_src-a6328ec1abececdb6ba1c0b32d9c06214d64a84e.zip chromium_src-a6328ec1abececdb6ba1c0b32d9c06214d64a84e.tar.gz chromium_src-a6328ec1abececdb6ba1c0b32d9c06214d64a84e.tar.bz2 | |
Explicitly set use_nacl_clang in gyp_defines everywhere in SDK build
This will make the SDK build robust against changing the default from
0 to 1.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3946
R=binji@chromium.org,sbc@chromium.org
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk
Review URL: https://codereview.chromium.org/1318823004
Cr-Commit-Position: refs/heads/master@{#345810}
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 18 |
1 files changed, 12 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 0fa015d..cbe88a0 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -484,9 +484,12 @@ def GypNinjaBuild_NaCl(rel_out_dir): out_dir_clang_64 = MakeNinjaRelPath(rel_out_dir + '-clang-x64') out_dir_clang_arm = MakeNinjaRelPath(rel_out_dir + '-clang-arm') - GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_32) - GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_64) - GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm) + GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_32, + gyp_defines=['use_nacl_clang=0']) + GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_64, + gyp_defines=['use_nacl_clang=0']) + GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm, + gyp_defines=['use_nacl_clang=0']) GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_clang_32, gyp_defines=['use_nacl_clang=1']) GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', @@ -589,11 +592,14 @@ def BuildStepBuildToolchains(pepperdir, toolchains, build, clean): GypNinjaBuild_Breakpad(GYPBUILD_DIR + '-x64') if set(toolchains) & set(['x86_glibc', 'x86_newlib']): - GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-ia32') - GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-x64') + GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-ia32', + ['use_nacl_clang=0']) + GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-x64', + ['use_nacl_clang=0']) if set(toolchains) & set(['arm_glibc', 'arm_newlib']): - GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm') + GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm', + ['use_nacl_clang=0'] ) if 'pnacl' in toolchains: GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-clang-ia32', |