aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2011-05-13 00:22:50 -0700
committerDoug Kwan <dougkwan@google.com>2011-05-13 00:22:50 -0700
commitc8f863ea379ef46539fd3185a33f17220aab970e (patch)
treefd97dc70ebd0ac3b5f4de16d5599a953c80caace
parent50adde9d855b73b5b9e5532ceed6272807b34701 (diff)
downloadbuild-c8f863ea379ef46539fd3185a33f17220aab970e.tar.gz
Configure target of host libbfd correctly.
Change-Id: I30c4fa2e008f62c7d96677ba7219f0d5aec5d12d
-rw-r--r--Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 853b72c..d16e622 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,7 @@ endif
.PHONY: config-host-libbfd build-host-libbfd install-host-libbfd
config-host-libbfd: stmp-config-host-libbfd
LIBBFD_CONFIG_ARGS=--prefix=$(prefix) \
- --enable-targets=all --host=${host} --build=${build} \
+ --target=${target_alias} --host=${host} --build=${build} \
$(baseargs) --disable-shared \
--enable-install-libbfd --with-included-gettext
stmp-config-host-libbfd: config.status
@@ -344,13 +344,15 @@ stmp-config-host-libbfd: config.status
build-host-libbfd: stmp-build-host-libbfd
stmp-build-host-libbfd: stmp-config-host-libbfd
$(MAKE) -C libbfd-${BINUTILS_VERSION} all-bfd all-libiberty && \
+ $(MAKE) -C libbfd-${BINUTILS_VERSION}/intl libintl.a && \
$(STAMP) $@
# Also include libintl.a. We have to do this manully since the
# source of libintl in binutils is modified to not install the library.
# We build with -m32 always. To avoid installing libiberty.a into /lib32,
# we need to manually install the archive. This will need to be cleaned up.
install-host-libbfd: stmp-build-host-libbfd install-target-binutils
- $(MAKE) -C libbfd-${BINUTILS_VERSION} install-bfd install-libiberty && \
+ $(MAKE) -C libbfd-${BINUTILS_VERSION}/bfd install \
+ bfdlibdir=$(libdir) bfdincludedir=$(includedir) && \
$(INSTALL) -m 644 libbfd-${BINUTILS_VERSION}/intl/libintl.a \
$(libdir) && \
$(INSTALL) -m 644 libbfd-${BINUTILS_VERSION}/libiberty/libiberty.a \