diff options
Diffstat (limited to 'toolchain/eglibc/Makefile')
| -rw-r--r-- | toolchain/eglibc/Makefile | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 0b23169cd..9988ef5de 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -105,33 +105,20 @@ $(WRKBUILD)/.configured: done touch $@ -$(EGLIBC_BUILD_DIR_FINAL)/libc.so: $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured for abi in $(TABI); do \ ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-$${abi/*:/} cross-compiling=yes all ;\ done touch $@ -$(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so +$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled for abi in $(TABI); do \ ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-$${abi/*:/} install_root=$(STAGING_TARGET_DIR)-$${abi/*:/} install ;\ done -ifeq ($(ADK_TARGET_ABI_64),y) + # default libgcc searching for 64 bit libraries ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-64 install_root=$(STAGING_TARGET_DIR) install -endif -ifeq ($(ADK_TARGET_ABI_32),y) - ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-32 install_root=$(STAGING_TARGET_DIR) install -endif -ifeq ($(ADK_TARGET_ABI_X32),y) - ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-x32 install_root=$(STAGING_TARGET_DIR) install -endif touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h - # for libgcc build we need C library files, 64 bit default - mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2 ; \ - $(CP) $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)-64/usr/lib/* \ - $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/; \ - rm $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/libc.so ; \ for abi in $(TABI); do \ mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \ $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \ @@ -178,4 +165,21 @@ $(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so touch $@ endif +ifeq ($(ADK_TARGET_WITH_MULTILIB),y) +$(WRKBUILD)/.fixup: +ifeq ($(ADK_TARGET_ABI_64),y) + ${CP} $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)/lib + ${CP} $(STAGING_TARGET_DIR)-64/usr/lib/* $(STAGING_TARGET_DIR)/usr/lib +endif +ifeq ($(ADK_TARGET_ABI_32),y) + ${CP} $(STAGING_TARGET_DIR)-32/lib/* $(STAGING_TARGET_DIR)/lib + ${CP} $(STAGING_TARGET_DIR)-32/usr/lib/* $(STAGING_TARGET_DIR)/usr/lib +endif +ifeq ($(ADK_TARGET_ABI_X32),y) + ${CP} $(STAGING_TARGET_DIR)-x32/lib/* $(STAGING_TARGET_DIR)/lib + ${CP} $(STAGING_TARGET_DIR)-x32/usr/lib/* $(STAGING_TARGET_DIR)/usr/lib +endif + touch $@ +endif + include ${TOPDIR}/mk/toolchain.mk |