From 96d55f8d22db989b1a82e984c0040ba7df12a9f9 Mon Sep 17 00:00:00 2001
From: Doug Kwan <dougkwan@google.com>
Date: Sun, 13 Mar 2011 20:55:27 -0700
Subject: Build libbfd for host seperately and install in <toolchain root>/lib.

Change-Id: I05125f833a9ffc4172594431eff5bce34e2e2d65
---
 Makefile.in | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 5ea6cc6..22f6b3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -168,9 +168,11 @@ endif
 all: build
 
 # top level
-build: build-target-binutils build-target-gcc build-target-gdb
+build: build-target-binutils build-host-libbfd build-target-gcc \
+	build-target-gdb
 
-install: install-target-binutils install-target-gcc install-target-gdb
+install: install-target-binutils install-host-libbfd install-target-gcc \
+	install-target-gdb
 
 # To support canadian cross build we need to build build->target toolchain
 # as well as final host->target toolchain.
@@ -233,7 +235,7 @@ config-target-binutils: stmp-config-target-binutils
 # We do not want to enable shared libraries in binutils
 BINUTILS_CONFIG_ARGS=--prefix=$(prefix) \
 	--target=${cur_target} --host=${cur_host} --build=${cur_build} \
-	$(baseargs) --disable-shared --enable-install-libbfd
+	$(baseargs) --disable-shared
 stmp-config-target-binutils: config.status $(canadian_stmp)
 	([ -d ${BINUTILS_VERSION} ] || \
 	  mkdir ${BINUTILS_VERSION}) && \
@@ -282,7 +284,25 @@ install-target-gold: stmp-build-target-gold install-target-binutils
 
 endif
 
-# target gcc rules
+# build libbfd for host.  We configure with all targets, so this is built
+# separately from the same source.
+.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} \
+	$(baseargs) --disable-shared --enable-install-libbfd
+stmp-config-host-libbfd: config.status
+	([ -d libbfd-${BINUTILS_VERSION} ] || \
+	  mkdir libbfd-${BINUTILS_VERSION}) && \
+	(cd libbfd-${BINUTILS_VERSION} ; \
+	 $(call find-package-srcdir, ${BINUTILS_VERSION})/configure \
+	  $(LIBBFD_CONFIG_ARGS)) && \
+	$(STAMP) $@
+build-host-libbfd: stmp-build-host-libbfd
+stmp-build-host-libbfd: stmp-config-host-libbfd
+	$(MAKE) -C libbfd-${BINUTILS_VERSION} all-bfd && $(STAMP) $@
+install-host-libbfd: stmp-build-host-libbfd install-target-binutils
+	$(MAKE) -C libbfd-${BINUTILS_VERSION} install-bfd
 
 # target gcc rules
 .PHONY: config-target-gcc build-target-gcc install-target-gcc
-- 
cgit v1.2.3