summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-26 22:04:22 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-26 22:04:22 +0000
commit3ed5a64e59d5669f75356e32041053e3d4fdfe41 (patch)
tree47b694b407a2f97c8bd73cdc5061f68afbf625b1 /base
parentdcc476468472be99899fe1942a856d3003c4e3d7 (diff)
downloadchromium_src-3ed5a64e59d5669f75356e32041053e3d4fdfe41.zip
chromium_src-3ed5a64e59d5669f75356e32041053e3d4fdfe41.tar.gz
chromium_src-3ed5a64e59d5669f75356e32041053e3d4fdfe41.tar.bz2
Add the host toolset to base:sanitizer_options. Fix a typo in nacl.gyp
This is a follow-up for https://codereview.chromium.org/201153007/ intended to fix the ChromeOS ASan bots. BUG=302040 R=thakis@chromium.org TBR=mseaborn@chromium.org Review URL: https://codereview.chromium.org/213113002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 7cda040..168a650 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1012,7 +1012,8 @@
{
'target_name': 'sanitizer_options',
'type': 'static_library',
- 'variables': {
+ 'toolsets': ['host', 'target'],
+ 'variables': {
# Every target is going to depend on sanitizer_options, so allow
# this one to depend on itself.
'prune_self_dependency': 1,