diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 22:42:32 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 22:42:32 +0000 |
| commit | c8d60658c0d2f8c841a1964bfb308d9b5328c17d (patch) | |
| tree | 7c5829eee89124ad03fb85dff2dc4b9a3e8a1ea6 /build | |
| parent | 8713c1f0327e7f8ff460d5bb77d638b722a97464 (diff) | |
| download | chromium_src-c8d60658c0d2f8c841a1964bfb308d9b5328c17d.zip chromium_src-c8d60658c0d2f8c841a1964bfb308d9b5328c17d.tar.gz chromium_src-c8d60658c0d2f8c841a1964bfb308d9b5328c17d.tar.bz2 | |
Revert 246117 "gn: Default is_clang to true on iOS."
This isn't correct for the xcode iOS builder.
> 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
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/138023008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/config/BUILDCONFIG.gn | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index 38da66c..c4a57b0 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -161,11 +161,6 @@ 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 |