diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 20:13:57 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 20:13:57 +0000 |
| commit | fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f (patch) | |
| tree | 0910724e0623d076a50ca676caef56e0708ceaec /build/common.gypi | |
| parent | 2329792307deebd09cf0b79bda7dfeffae61c715 (diff) | |
| download | chromium_src-fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f.zip chromium_src-fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f.tar.gz chromium_src-fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f.tar.bz2 | |
This does a few things:
- only include cflags/linkflags and other compiler settings that are target-specific when building for 'target'
- make build tools (protoc) compile for 'host', and change the dependencies on them to reflect that.
Review URL: http://codereview.chromium.org/265031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index 700bdc0..37dcdce 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -667,8 +667,8 @@ ], }], ['target_arch=="arm"', { - 'conditions': [ - ['armv7==1', { + 'target_conditions': [ + ['armv7==1 and _toolset=="target"', { 'cflags': [ '-march=armv7-a', '-mtune=cortex-a8', @@ -679,12 +679,15 @@ ], }], ['sysroot!=""', { - 'cflags': [ - '--sysroot=<(sysroot)', - ], - 'ldflags': [ - '--sysroot=<(sysroot)', - ], + 'target_conditions': [ + ['_toolset=="target"', { + 'cflags': [ + '--sysroot=<(sysroot)', + ], + 'ldflags': [ + '--sysroot=<(sysroot)', + ], + }]] }], ['no_strict_aliasing==1', { 'cflags': [ |