diff options
| author | sbc <sbc@chromium.org> | 2016-02-02 11:43:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 19:44:17 +0000 |
| commit | af2c8dd14b11ade2cde6a389b20eb20cab5eee62 (patch) | |
| tree | d86719db2c3f261ac8af5da86fdbebe748d1322d /base | |
| parent | 1bbcb027e8e7113a50aecac2bf01aa723412248d (diff) | |
| download | chromium_src-af2c8dd14b11ade2cde6a389b20eb20cab5eee62.zip chromium_src-af2c8dd14b11ade2cde6a389b20eb20cab5eee62.tar.gz chromium_src-af2c8dd14b11ade2cde6a389b20eb20cab5eee62.tar.bz2 | |
Fix gyp build of base/allocator on win32 when cross compiling
base/allocator can be built for both 'host' and 'target'
toolchain but libcmt was declared for 'target' only.
This means that if any host binary depends on base/allocator
there is currently gyp failure on windows:
e.g:
> set GYP_CROSSCOMPILE=1
> build\gyp_chromium ppapi\native_client\native_client.gyp --depth=.
gyp: Dependency 'base\allocator\allocator.gyp:libcmt#host' not found while trying to load target base\allocator\allocator.gyp:allocator#host
This is currently causing failures on the win_nacl_sdk bot.
CQ_EXTRA_TRYBOTS=tryserver.chromium.win:win_nacl_sdk_build
Review URL: https://codereview.chromium.org/1651143004
Cr-Commit-Position: refs/heads/master@{#373007}
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 727f32a..37459e0 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -379,6 +379,7 @@ 'targets': [ { 'target_name': 'libcmt', + 'toolsets': ['host', 'target'], 'type': 'none', 'actions': [ { |