From 4628ee31a9a8bd8a12829620e703fe15e78e491b Mon Sep 17 00:00:00 2001
From: Abhishek Arya <inferno@chromium.org>
Date: Fri, 21 Aug 2020 22:12:46 -0700
Subject: Revert "Revert "Compile + install LLVMgold.so so -flto works (#4332)"
 (#4351)" (#4352)

This reverts commit 7f8f5e0182ec994ed5b7340cdf90c532da1ee328.
---
 infra/base-images/base-clang/checkout_build_install_llvm.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'infra')

diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh
index b8f4f0b7..3508187d 100755
--- a/infra/base-images/base-clang/checkout_build_install_llvm.sh
+++ b/infra/base-images/base-clang/checkout_build_install_llvm.sh
@@ -17,7 +17,7 @@
 
 NPROC=16  # See issue #4270. The compiler crashes on GCB instance with 32 vCPUs.
 
-LLVM_DEP_PACKAGES="build-essential make cmake ninja-build git python2.7 g++-multilib"
+LLVM_DEP_PACKAGES="build-essential make cmake ninja-build git python2.7 g++-multilib binutils-dev"
 apt-get install -y $LLVM_DEP_PACKAGES
 
 # Checkout
@@ -52,6 +52,7 @@ function cmake_llvm {
       -DCMAKE_BUILD_TYPE=Release \
       -DLLVM_TARGETS_TO_BUILD="$TARGET_TO_BUILD" \
       -DLLVM_ENABLE_PROJECTS="$PROJECTS_TO_BUILD" \
+      -DLLVM_BINUTILS_INCDIR="/usr/include/" \
       $extra_args \
       $LLVM_SRC/llvm
 }
@@ -109,6 +110,7 @@ case $(uname -m) in
 esac
 
 PROJECTS_TO_BUILD="libcxx;libcxxabi;compiler-rt;clang;lld"
+
 cmake_llvm
 ninja -j $NPROC
 
-- 
cgit v1.2.3