From 11ba70b77757db4d34eae8ed3de586416924078e Mon Sep 17 00:00:00 2001 From: Manoj Gupta Date: Sat, 7 Sep 2019 09:51:31 +0000 Subject: Revert "Use bfd as the linker to build vboot_reference." This reverts commit 4856877a76a90ab1851c0e24593ec67e6375a60a. Reason for revert: Root cause fixed by CL:1790955. Original change's description: > Use bfd as the linker to build vboot_reference. > > Coreboot uses vboot_reference to build futility as a host binary. > However, it passes a target path for linking which causes LLD to > error out. > e.g. x86_64-pc-linux-clang -L/build/veyron_minnie/usr/lib > where -L/build/veyron_minnie/usr/lib should not be passed > as futility is being linked as a host binary. > > Use bfd as the linker temporarily as it only produces a warning > and does not error out. > > BUG=chromium:999217 > TEST=coreboot builds > BRANCH=None > > Change-Id: I8716ff3a0b4cc8afc54a3cc95ca5c1bfdcba6c9f > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1789676 > Tested-by: Manoj Gupta > Reviewed-by: Julius Werner > Commit-Queue: Manoj Gupta Bug: chromium:999217 Change-Id: Ibf69ca06e3ae2e681176499b23c673eda8d77b6c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1790956 Tested-by: Manoj Gupta Reviewed-by: Julius Werner Commit-Queue: Manoj Gupta --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0ccd04af..fa63773b 100644 --- a/Makefile +++ b/Makefile @@ -165,8 +165,7 @@ CFLAGS += -DCHROMEOS_ENVIRONMENT ${COMMON_FLAGS} endif # Needs -Wl because LD is actually set to CC by default. -# Build with bfd linker, https://crbub.com/999217. -LDFLAGS ?= -Wl,--gc-sections -fuse-ld=bfd +LDFLAGS ?= -Wl,--gc-sections ifneq (${DEBUG},) CFLAGS += -DVBOOT_DEBUG -- cgit v1.2.1