Commit 29afbc32 authored by thestig's avatar thestig Committed by Commit bot

Add linux_use_bundled_binutils_override GN variable.

Review-Url: https://codereview.chromium.org/2293853002
Cr-Commit-Position: refs/heads/master@{#415333}
parent b3ab255e
...@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni") ...@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
import("//build/config/nacl/config.gni") import("//build/config/nacl/config.gni")
import("//build/toolchain/cc_wrapper.gni") import("//build/toolchain/cc_wrapper.gni")
import("//build/toolchain/toolchain.gni") import("//build/toolchain/toolchain.gni")
import("//build_overrides/build.gni")
if (current_cpu == "arm" || current_cpu == "arm64") { if (current_cpu == "arm" || current_cpu == "arm64") {
import("//build/config/arm.gni") import("//build/config/arm.gni")
...@@ -38,7 +39,8 @@ declare_args() { ...@@ -38,7 +39,8 @@ declare_args() {
# only two architectures that are currently checked in). Turn this off when # 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. # you are using a custom toolchain and need to control -B in cflags.
linux_use_bundled_binutils = 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", binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
root_build_dir) root_build_dir)
......
...@@ -22,6 +22,9 @@ build_with_chromium = true ...@@ -22,6 +22,9 @@ build_with_chromium = true
# Some non-Chromium builds don't support building java targets. # Some non-Chromium builds don't support building java targets.
enable_java_templates = true 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. # Allows different projects to specify their own suppressions files.
asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc" asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc"
lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc" lsan_suppressions_file = "//build/sanitizers/lsan_suppressions.cc"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment