diff options
| author | Doug Kwan <dougkwan@google.com> | 2011-05-13 00:22:50 -0700 |
|---|---|---|
| committer | Jim Huang <jim.huang@linaro.org> | 2011-05-23 20:16:47 +0800 |
| commit | 431c5386d78f71ed81210987717dd984f06d4a3d (patch) | |
| tree | 0897a977d4fbdd05a63521e8fc4bbdea79e7a89e | |
| parent | 275c4490689883ab94676526544580c8deecc247 (diff) | |
Configure target of host libbfd correctly.
Change-Id: I30c4fa2e008f62c7d96677ba7219f0d5aec5d12d
Signed-off-by: Jim Huang <jim.huang@linaro.org>
| -rw-r--r-- | Makefile.in | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index f4f658d..d3de043 100644 --- a/Makefile.in +++ b/Makefile.in @@ -329,7 +329,8 @@ endif 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 \ + $(baseargs) --disable-shared \ + --enable-install-libbfd --with-included-gettext \ --disable-werror stmp-config-host-libbfd: config.status ([ -d libbfd-${BINUTILS_VERSION} ] || \ @@ -340,9 +341,20 @@ stmp-config-host-libbfd: config.status $(STAMP) $@ build-host-libbfd: stmp-build-host-libbfd stmp-build-host-libbfd: stmp-config-host-libbfd - $(MAKE) -C libbfd-${BINUTILS_VERSION} all-bfd && $(STAMP) $@ + $(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 + $(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 \ + $(libdir) # target gcc rules .PHONY: config-target-gcc build-target-gcc install-target-gcc |