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

Unified Diff: build/config/compiler/BUILD.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 | « build/config/BUILDCONFIG.gn ('k') | build/config/ios/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index e0e1073546aad9e8b49b2e1fae3f81adaed8cf8e..3ed78f3baedd80413ba62b4b559db83fc09237f6 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/config.gni")
-import("//build/config/sysroot.gni")
if (cpu_arch == "arm") {
import("//build/config/arm.gni")
}
@@ -63,12 +62,7 @@ config("compiler") {
# ----------------------------------
if (is_mac || is_ios) {
# These flags are shared between the C compiler and linker.
- common_mac_flags = [ "-isysroot", sysroot ]
- if (is_mac) {
- common_mac_flags += [ "-mmacosx-version-min=10.6" ]
- } else {
- cflags += [ "-mios-simulator-version-min=6.0" ]
- }
+ common_mac_flags = []
# CPU architecture.
if (cpu_arch == "x64") {
@@ -175,17 +169,6 @@ config("compiler") {
]
}
- if (sysroot != "") {
- cflags += [ "--sysroot=" + sysroot ]
- ldflags += [ "--sysroot=" + sysroot ]
-
- # Need to get some linker flags out of the sysroot.
- ldflags += [ exec_script("../linux/sysroot_ld_path.py",
- [rebase_path("../../linux/sysroot_ld_path.sh", ".", root_build_dir),
- sysroot],
- "value") ]
- }
-
ldflags += [
"-fPIC",
"-pthread",
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | build/config/ios/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698