chromium/src
0
Fork 0
Code Activity

Add linux_use_bundled_binutils_override GN variable.

Browse Source 
Review-Url: https://codereview.chromium.org/2293853002
Cr-Commit-Position: refs/heads/master@{#415333}
This commit is contained in:
thestig
2016-08-30 10:18:00 -07:00
committed by Commit bot
parent b3ab255e9b
commit 29afbc3212
2 changed files with 6 additions and 1 deletions
build/config/compiler
BUILD.gn
build_overrides
build.gni

4
build/config/compiler/BUILD.gn

@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
import("//build/config/nacl/config.gni")
import("//build/toolchain/cc_wrapper.gni")
import("//build/toolchain/toolchain.gni")
import("//build_overrides/build.gni")
if (current_cpu == "arm" || current_cpu == "arm64") {
import("//build/config/arm.gni")
@ -38,7 +39,8 @@ declare_args() {
# only two architectures that are currently checked in). Turn this off when
# you are using a custom toolchain and need to control -B in cflags.
linux_use_bundled_binutils =
is_linux && (current_cpu == "x64" || current_cpu == "x86")
linux_use_bundled_binutils_override && is_linux &&
(current_cpu == "x64" || current_cpu == "x86")
binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
root_build_dir)

3
build_overrides/build.gni

@ -22,6 +22,9 @@ build_with_chromium = true
# Some non-Chromium builds don't support building java targets.
enable_java_templates = true
# Some non-Chromium builds don't use Chromium's third_party/binutils.
linux_use_bundled_binutils_override = true
# Allows different projects to specify their own suppressions files.
asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc"
lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc"