diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 07:41:23 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 07:41:23 +0000 |
| commit | 5aa8210fe7b367f2fc6eeaf8a8e36ff1a0658bde (patch) | |
| tree | 9044b2169042936eb3a2e51a3e29fc493ee9e56e /build/config/sysroot.gni | |
| parent | b0c5d4200882807fdad4760294585bb387801148 (diff) | |
| download | chromium_src-5aa8210fe7b367f2fc6eeaf8a8e36ff1a0658bde.zip chromium_src-5aa8210fe7b367f2fc6eeaf8a8e36ff1a0658bde.tar.gz chromium_src-5aa8210fe7b367f2fc6eeaf8a8e36ff1a0658bde.tar.bz2 | |
GN build fixes, mostly for Mac.
This hooks up detection for the "-arch" flag on Mac to set the GYP "ARCH" xcode variable. GN then removes the -arch argument from the compiler args, since GYP will then re-add it based on the ARCH value. Previously, not doing this resulting in mutliple "-arch" arguments to the compiler since GYP would always insert its own.
Disables some warnings on Windows for the re2 target to match the GYP build. The third warning (4018) that the GYP build sets is disabled globally so there's no need to do it for this target.
Hooks up some iOS SDK stuff.
BUG=336667
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/141433015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/config/sysroot.gni')
| -rw-r--r-- | build/config/sysroot.gni | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index 4d3958a..6340c3a7 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -43,6 +43,9 @@ if (is_android) { import("//build/config/mac/mac_sdk.gni") sysroot = mac_sdk_path +} else if (is_ios) { + import("//build/config/ios/ios_sdk.gni") + sysroot = ios_sdk_path } else { sysroot = "" } |