diff options
| author | sbc <sbc@chromium.org> | 2015-10-27 12:05:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 19:05:53 +0000 |
| commit | 99c43acddde02a9cf9b2759ec80bca9983984a82 (patch) | |
| tree | 5cc1e93c256b0de44a064a33ca40cba4a3ba5b06 /native_client_sdk | |
| parent | e2992e89db183cd71bdb688750e9b8290bd4079c (diff) | |
| download | chromium_src-99c43acddde02a9cf9b2759ec80bca9983984a82.zip chromium_src-99c43acddde02a9cf9b2759ec80bca9983984a82.tar.gz chromium_src-99c43acddde02a9cf9b2759ec80bca9983984a82.tar.bz2 | |
[NaCl SDK] Use gyp_nacl when building NaCl components via gyp
This fixes an the Mac SDK build which was failing due to
an incompatibility between chromium's chommon.gypi and
some of the untrusted targets in the NaCl tree.
Chromium's common.gypi was assuming all NaCl untrusted
targets define nacl_untrusted_build and adding libc++
headers to the include path for all non-nacl targets.
This was causing build failures since the libc++
headers are not compatible with the old version of gcc
used by NaCl.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk
Review URL: https://codereview.chromium.org/1413863008
Cr-Commit-Position: refs/heads/master@{#356357}
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 04a3160..a6433fa 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -465,15 +465,7 @@ def GypNinjaInstall(pepperdir, toolchains): def GypNinjaBuild_NaCl(rel_out_dir): - # TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only - # can use VS2010, not VS2013 which is now required by the Chromium repo. NaCl - # needs to be updated to perform the same logic as Chromium in detecting VS, - # which can now exist in the depot_tools directory. - # See https://code.google.com/p/nativeclient/issues/detail?id=4022 - # - # For now, let's use gyp_chromium to build these components. -# gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl') - gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium') + gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl') nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp') all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp') |