diff options
| author | Jing Yu <jingyu@google.com> | 2012-04-20 15:18:24 -0700 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-04-20 15:18:24 -0700 |
| commit | bdb501d14ede0c21cd6bd73699b01ec027637d5f (patch) | |
| tree | 2a863f9e26ebb75c56e64b6b88300eca710f99ed | |
| parent | 5ef7fa6f214e96660a9b16343fea904831e5e6e2 (diff) | |
| download | build-bdb501d14ede0c21cd6bd73699b01ec027637d5f.tar.gz | |
Always build 32bit host library to /lib32.
Change-Id: I73ed7f7e2120d8be761ec5fdbe747db523e1c53c
| -rw-r--r-- | Makefile.in | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index ea3bd2d..42d4a9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -354,12 +354,15 @@ endif # build libbfd for host. We configure with all targets, so this is built # separately from the same source. +# Required by Android build, we always build 32bit host libraries, and +# put the 32bit host libraries into /lib32. .PHONY: config-host-libbfd build-host-libbfd install-host-libbfd config-host-libbfd: stmp-config-host-libbfd LIBBFD_CONFIG_ARGS=--prefix=$(prefix) \ --target=${target_alias} --host=${host} --build=${build} \ $(baseargs) --disable-shared \ - --enable-install-libbfd --with-included-gettext + --enable-install-libbfd --with-included-gettext \ + CFLAGS=-m32 stmp-config-host-libbfd: config.status ([ -d libbfd-${BINUTILS_VERSION} ] || \ mkdir libbfd-${BINUTILS_VERSION}) && \ @@ -374,15 +377,15 @@ stmp-build-host-libbfd: stmp-config-host-libbfd $(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. +# We build with -m32 always, and install host libs into /lib32. +LIB32DIR=$(libdir)32 install-host-libbfd: stmp-build-host-libbfd install-target-binutils $(MAKE) -C libbfd-${BINUTILS_VERSION}/bfd install \ - bfdlibdir=$(libdir) bfdincludedir=$(includedir) && \ + bfdlibdir=$(LIB32DIR) bfdincludedir=$(includedir) && \ $(INSTALL_DATA) libbfd-${BINUTILS_VERSION}/intl/libintl.a \ - $(libdir) && \ + $(LIB32DIR) && \ $(INSTALL_DATA) libbfd-${BINUTILS_VERSION}/libiberty/libiberty.a \ - $(libdir) + $(LIB32DIR) # target gcc rules .PHONY: config-target-gcc build-target-gcc install-target-gcc |