Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 6c5b973fd5cff090cac407c2b7168893a25eca45..75c7604c0980bff2e52ea5f90c2630e413b937a4 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -83,7 +83,7 @@ config("compiler") { |
if (cpu_arch == "x64") { |
cflags += "-m64" |
ldflags += "-m64" |
- } else if (cpu_arch == "x32") { |
+ } else if (cpu_arch == "x86") { |
cflags += "-m32" |
ldflags += "-m32" |
} |
@@ -125,6 +125,12 @@ 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 += [ |