Revert "Relativize cros compiler path"
This reverts commit be7c12590cbdbcf40ce36fcc3996ad9e3982100d. Reason for revert: Can't find gold. /bin/sh: 1: ../../build/toolchain/cros/build/cros_cache/chrome-sdk/tarballs/daisy+10974.0.0+target_toolchain/usr/x86_64-pc-linux-gnu/armv7a-cros-linux-gnueabi/binutils-bin/2.27.0-gold: not found Original change's description: > Relativize cros compiler path > > Combined with https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1180801 > this patch removes absolute path from command line for simple chrome build. > > This is a part of effort for build cache sharing when using goma by > removing absolute path from compile result. > > Bug: chromium:846610 > Change-Id: Ia40a7194b4e485f26424f27ebfc210355e352cc0 > Reviewed-on: https://chromium-review.googlesource.com/1180826 > Reviewed-by: Dirk Pranke <dpranke@chromium.org> > Commit-Queue: Takuto Ikuta <tikuta@chromium.org> > Cr-Commit-Position: refs/heads/master@{#584648} TBR=vapier@chromium.org,dpranke@chromium.org,tikuta@chromium.org,manojgupta@chromium.org Change-Id: I93891636a39e5b72f019f262c297c4f07239d0e2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:846610 Reviewed-on: https://chromium-review.googlesource.com/1182882 Reviewed-by: Yoshifumi Inoue <yosin@chromium.org> Commit-Queue: Yoshifumi Inoue <yosin@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#584649} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 347fb734c75d4e79e37eacfc43500acde1aa7584
This commit is contained in:
Родитель
3ab629996d
Коммит
a853806eb3
|
@ -12,15 +12,6 @@ gcc_toolchain("target") {
|
|||
ar = cros_target_ar
|
||||
cc = cros_target_cc
|
||||
cxx = cros_target_cxx
|
||||
|
||||
# Relativize path if compiler is specified such that not to lookup from $PATH.
|
||||
if (cc != get_path_info(cc, "file")) {
|
||||
cc = rebase_path(cc, root_build_dir)
|
||||
}
|
||||
if (cxx != get_path_info(cxx, "file")) {
|
||||
cxx = rebase_path(cxx, root_build_dir)
|
||||
}
|
||||
|
||||
ld = cxx
|
||||
if (cros_target_ld != "") {
|
||||
ld = cros_target_ld
|
||||
|
@ -55,14 +46,6 @@ gcc_toolchain("nacl_bootstrap") {
|
|||
ar = cros_target_ar
|
||||
cc = cros_target_cc
|
||||
cxx = cros_target_cxx
|
||||
|
||||
# Relativize path if compiler is specified such that not to lookup from $PATH.
|
||||
if (cc != get_path_info(cc, "file")) {
|
||||
cc = rebase_path(cc, root_build_dir)
|
||||
}
|
||||
if (cxx != get_path_info(cxx, "file")) {
|
||||
cxx = rebase_path(cxx, root_build_dir)
|
||||
}
|
||||
ld = cxx
|
||||
if (cros_target_ld != "") {
|
||||
ld = cros_target_ld
|
||||
|
@ -94,14 +77,6 @@ gcc_toolchain("host") {
|
|||
ar = cros_host_ar
|
||||
cc = cros_host_cc
|
||||
cxx = cros_host_cxx
|
||||
|
||||
# Relativize path if compiler is specified such that not to lookup from $PATH.
|
||||
if (cc != get_path_info(cc, "file")) {
|
||||
cc = rebase_path(cc, root_build_dir)
|
||||
}
|
||||
if (cxx != get_path_info(cxx, "file")) {
|
||||
cxx = rebase_path(cxx, root_build_dir)
|
||||
}
|
||||
ld = cxx
|
||||
if (cros_host_ld != "") {
|
||||
ld = cros_host_ld
|
||||
|
@ -131,14 +106,6 @@ gcc_toolchain("v8_snapshot") {
|
|||
ar = cros_v8_snapshot_ar
|
||||
cc = cros_v8_snapshot_cc
|
||||
cxx = cros_v8_snapshot_cxx
|
||||
|
||||
# Relativize path if compiler is specified such that not to lookup from $PATH.
|
||||
if (cc != get_path_info(cc, "file")) {
|
||||
cc = rebase_path(cc, root_build_dir)
|
||||
}
|
||||
if (cxx != get_path_info(cxx, "file")) {
|
||||
cxx = rebase_path(cxx, root_build_dir)
|
||||
}
|
||||
ld = cxx
|
||||
if (cros_v8_snapshot_ld != "") {
|
||||
ld = cros_v8_snapshot_ld
|
||||
|
|
Загрузка…
Ссылка в новой задаче