Commit bfa1f92c authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

build: Default the paths to CrOS's nm and readelf to those in binutils.

This is what Simple Chrome does today:
https://source.chromium.org/chromium/chromium/src/+/master:third_party/chromite/cli/cros/cros_chrome_sdk.py;l=1008

Setting a proper default here will let us delete that bit from
cros_chrome_sdk.

Bug: 937821
Change-Id: Ic83983c75f392a93256dc9cb278bbbf16081e4fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015822Reviewed-by: default avatarGeorge Burgess <gbiv@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735028}
parent 0b3e8bde
......@@ -33,6 +33,7 @@
# target_cpu = "x64"
import("//build/config/clang/clang.gni")
import("//build/config/compiler/compiler.gni")
declare_args() {
# These must be specified for a board-specific build.
......@@ -54,8 +55,8 @@ declare_args() {
cros_host_cc = "${clang_base_path}/bin/clang"
cros_host_cxx = "${clang_base_path}/bin/clang++"
cros_host_is_clang = true
cros_host_nm = ""
cros_host_readelf = ""
cros_host_nm = "${binutils_path}/nm"
cros_host_readelf = "${binutils_path}/readelf"
cros_host_extra_cflags = ""
cros_host_extra_cppflags = ""
cros_host_extra_cxxflags = ""
......@@ -65,8 +66,8 @@ declare_args() {
cros_v8_snapshot_cc = "${clang_base_path}/bin/clang"
cros_v8_snapshot_cxx = "${clang_base_path}/bin/clang++"
cros_v8_snapshot_is_clang = true
cros_v8_snapshot_nm = ""
cros_v8_snapshot_readelf = ""
cros_v8_snapshot_nm = "${binutils_path}/nm"
cros_v8_snapshot_readelf = "${binutils_path}/readelf"
cros_v8_snapshot_extra_cflags = ""
cros_v8_snapshot_extra_cppflags = ""
cros_v8_snapshot_extra_cxxflags = ""
......
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