summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjustincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-09 09:20:01 +0000
committerjustincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-09 09:20:01 +0000
commitb4530c892587a39604027a329bfc3bdbdf9e9c76 (patch)
tree5a7e98e4e5ffd29be5683b967db1db4be7cda091 /build
parent46a6f62b1e763a7c04cade781074e45510c7a0e5 (diff)
downloadchromium_src-b4530c892587a39604027a329bfc3bdbdf9e9c76.zip
chromium_src-b4530c892587a39604027a329bfc3bdbdf9e9c76.tar.gz
chromium_src-b4530c892587a39604027a329bfc3bdbdf9e9c76.tar.bz2
Enable clang and host_os when generating ninja-ios.
Default clang=1 and host_os==mac when GENERATOR==ninja and OS==ios. BUG=236517 Review URL: https://chromiumcodereview.appspot.com/14740022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi8
1 files changed, 8 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 915d173..e48b6fa 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1517,6 +1517,14 @@
# iOS uses a whitelist to filter resources.
'-w', '<(DEPTH)/build/ios/grit_whitelist.txt'
],
+
+ # Enable clang and host builds when generating with ninja-ios.
+ 'conditions': [
+ ['"<(GENERATOR)"=="ninja"', {
+ 'clang%': 1,
+ 'host_os%': "mac",
+ }]
+ ],
}],
['enable_extensions==1', {
'grit_defines': ['-D', 'enable_extensions'],