Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: build/config/BUILDCONFIG.gn

Issue 149163005: Work on GN iOS build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 38da66cef0ffbafed63f5dde29eb0adb68fb0989..671bdee933bf81dc6af0b6106a7dd3d7a3df36b7 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -80,6 +80,10 @@ declare_args() {
# When running in gyp-generating mode, this is the root of the build tree.
gyp_output_dir = "out"
+
+ # When running in gyp-generating mode, this flag indicates if the current GYP
+ # generator is xcode. Can only be true when building for iOS).
+ is_gyp_xcode_generator = false
}
# =============================================================================
@@ -161,9 +165,8 @@ if (os == "win") {
is_nacl = false
is_posix = true
is_win = false
- if (!is_clang) {
+ if (!is_gyp_xcode_generator) {
# Always use clang on iOS when using ninja
- # (which is always true when using GN).
is_clang = true
}
} else if (os == "linux") {
@@ -332,10 +335,13 @@ native_compiler_configs = [
"//build/config/compiler:runtime_library",
]
if (is_win) {
- native_compiler_configs += [
- "//build/config/win:sdk",
- ]
-} else if (is_clang) {
+ native_compiler_configs += [ "//build/config/win:sdk", ]
+} else if (is_mac) {
+ native_compiler_configs += [ "//build/config/mac:sdk", ]
+} else if (is_ios) {
+ native_compiler_configs += [ "//build/config/ios:sdk", ]
+}
+if (is_clang) {
native_compiler_configs += [ "//build/config/clang:find_bad_constructs" ]
}
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698