diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-12 16:27:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-12 16:27:02 +0200 |
| commit | b0857d40f503a29f7cf1dd9bfab3f60e6b0152f6 (patch) | |
| tree | 654962f4ea80ae04b8f1869e72f349dd0d9a4e92 /toolchain/glibc/Makefile | |
| parent | f04227421063498a88707c43ec80b2b70d9b8d83 (diff) | |
update glibc to latest upstream
Diffstat (limited to 'toolchain/glibc/Makefile')
| -rw-r--r-- | toolchain/glibc/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 98a01d9c8..f8f0080fc 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -34,8 +34,6 @@ ifeq ($(ADK_TARGET_WITH_MULTILIB),y) $(WRKBUILD)/.headers_configure: for abi in $(TABI); do \ mkdir -p $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \ - (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ - ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports); \ (cd $(GLIBC_BUILD_DIR_INITIAL)-$${abi/*:/}; \ ${GLIBC_ENV} \ CC="${REAL_GNU_TARGET_NAME}-gcc -m$${abi/*:/}" \ @@ -60,8 +58,6 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure else $(WRKBUILD)/.headers_configure: mkdir -p $(GLIBC_BUILD_DIR_INITIAL) - (cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); \ - ln -sf ../../w-glibc-ports-$(PKG_VERSION)-1/glibc-ports-$(PKG_VERSION)/ ports); (cd $(GLIBC_BUILD_DIR_INITIAL); \ ${GLIBC_ENV} \ $(WRKBUILD)/configure \ @@ -77,7 +73,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure $(MAKE) ${GLIBC_MAKEOPTS} install-headers \ ); touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h touch $@ endif @@ -111,7 +107,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled # default libgcc searching for 64 bit libraries ${GLIBC_ENV} $(MAKE) -C $(GLIBC_BUILD_DIR_FINAL)-64 install_root=$(STAGING_TARGET_DIR) install touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h - touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,soft,hard}.h 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/* \ |