aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJing Yu <jingyu@google.com>2010-04-24 20:44:35 -0700
committerJing Yu <jingyu@google.com>2010-04-24 20:44:35 -0700
commitd4a4fbe945ba4792095fdab4e7c49ce6b47e3e98 (patch)
treea707dd3b7c3acbc9603f132a5bc21eb64321bc3b
parent0db5f6eaac60c4434831523619b68b2497873694 (diff)
Update build script to support gold.
Change-Id: Ie2084dfac8d1a267973650aa32e44f2a7c7bd4ab
-rw-r--r--Makefile.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 78f6c7f..80c5a14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,14 +72,19 @@ TARGET_BINUTILS_BUILDDIR=$(abs_builddir)/$(BINUTILS_VERSION)
TARGET_GCC_BUILDDIR=$(abs_builddir)/$(GCC_VERSION)
TEMP_INSTALLDIR=$(abs_builddir)/temp-install
+# Figure out where to find the ld binary.
+FIND_TARGET_LD=\
+ `[ -d $(TARGET_BINUTILS_BUILDDIR)/gold ] && echo "gold" || echo "ld"`
+
# We export these insteading when configuring target gcc and newlib
TARGET_BINUTILS_EXPORTS= \
export AS_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/gas/as-new \
- LD_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/ld/ld-new \
+ LD_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/$(FIND_TARGET_LD)/ld-new \
AR_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/binutils/ar \
NM_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/binutils/nm-new \
STRIP_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/binutils/strip-new \
- RANLIB_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/binutils/ranlib
+ RANLIB_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/binutils/ranlib \
+ OBJDUMP_FOR_TARGET=$(TARGET_BINUTILS_BUILDDIR)/binutils/objdump
TARGET_MINIMAL_GCC_EXPORTS= \
export CC_FOR_TARGET="$(TARGET_GCC_BUILDDIR)/gcc/xgcc \