Chromium Code Reviews| Index: build/config/compiler/BUILD.gn |
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
| index f9e01af1968300094eb290adc62c0786902d420d..dc53717d21458ca3c49018ccd9f86579b472ecc1 100644 |
| --- a/build/config/compiler/BUILD.gn |
| +++ b/build/config/compiler/BUILD.gn |
| @@ -494,13 +494,13 @@ config("compiler_cpu_abi") { |
| if (is_posix && !(is_mac || is_ios)) { |
| # CPU architecture. We may or may not be doing a cross compile now, so for |
| # simplicity we always explicitly set the architecture. |
| - if (current_cpu == "x64") { |
| + if (target_cpu == "x64") { |
|
Dirk Pranke
2016/06/23 16:22:43
I think these changes are wrong and the existing c
|
| cflags += [ |
| "-m64", |
| "-march=x86-64", |
| ] |
| ldflags += [ "-m64" ] |
| - } else if (current_cpu == "x86") { |
| + } else if (target_cpu == "x86") { |
| cflags += [ "-m32" ] |
| ldflags += [ "-m32" ] |
| if (!is_nacl) { |
| @@ -510,7 +510,7 @@ config("compiler_cpu_abi") { |
| "-mmmx", |
| ] |
| } |
| - } else if (current_cpu == "arm") { |
| + } else if (target_cpu == "arm") { |
| if (is_clang && !is_android && !is_nacl) { |
| cflags += [ "--target=arm-linux-gnueabihf" ] |
| ldflags += [ "--target=arm-linux-gnueabihf" ] |
| @@ -531,12 +531,12 @@ config("compiler_cpu_abi") { |
| if (arm_tune != "") { |
| cflags += [ "-mtune=$arm_tune" ] |
| } |
| - } else if (current_cpu == "arm64") { |
| + } else if (target_cpu == "arm64") { |
| if (is_clang && !is_android && !is_nacl) { |
| cflags += [ "--target=aarch64-linux-gnu" ] |
| ldflags += [ "--target=aarch64-linux-gnu" ] |
| } |
| - } else if (current_cpu == "mipsel") { |
| + } else if (target_cpu == "mipsel") { |
| if (is_clang) { |
| # Temporarily needed due to unsupported MIPS macro instructions |
| # in inline asm code in third_party projects (libwebp and webrtc). |
| @@ -620,7 +620,7 @@ config("compiler_cpu_abi") { |
| } |
| cflags += [ "-m${mips_float_abi}-float" ] |
| - } else if (current_cpu == "mips64el") { |
| + } else if (target_cpu == "mips64el") { |
| if (mips_arch_variant == "r6") { |
| if (is_clang) { |
| if (is_android) { |
| @@ -645,7 +645,7 @@ config("compiler_cpu_abi") { |
| ] |
| ldflags += [ "-mips64r2" ] |
| } |
| - } else if (current_cpu == "pnacl" && is_nacl_nonsfi) { |
| + } else if (target_cpu == "pnacl" && is_nacl_nonsfi) { |
| if (target_cpu == "x86" || target_cpu == "x64") { |
| cflags += [ |
| "-arch", |