| 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",
|
|
|