diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 21:34:22 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 21:34:22 +0000 |
| commit | 86fc1639dd1b1a5d78d5b81f4655ae7d87e54b79 (patch) | |
| tree | 454e6dc8c0a81033762862937ed314c67709e82c /build/config | |
| parent | b3e62122541690c7e1341d31ca1348242cd2d64f (diff) | |
| download | chromium_src-86fc1639dd1b1a5d78d5b81f4655ae7d87e54b79.zip chromium_src-86fc1639dd1b1a5d78d5b81f4655ae7d87e54b79.tar.gz chromium_src-86fc1639dd1b1a5d78d5b81f4655ae7d87e54b79.tar.bz2 | |
gn: Default is_clang to true on iOS.
Mirrors this condition in build/common.gypi:
['OS == "ios"', {
# ...
# Enable clang and host builds when generating with ninja-ios.
'conditions': [
['"<(GENERATOR)"=="ninja"', {
'clang%': 1,
'host_os%': "mac",
}]
],
}],
BUG=336531
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/143323008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/config')
| -rw-r--r-- | build/config/BUILDCONFIG.gn | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index c4a57b0..38da66c 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -161,6 +161,11 @@ if (os == "win") { is_nacl = false is_posix = true is_win = false + if (!is_clang) { + # Always use clang on iOS when using ninja + # (which is always true when using GN). + is_clang = true + } } else if (os == "linux") { is_android = false is_chromeos = false |