diff options
| -rw-r--r-- | package/libstdcxx/Makefile | 4 | ||||
| -rw-r--r-- | package/uclibc/Makefile | 3 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 470cc57a7..efdb3ba72 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -29,9 +29,9 @@ INSTALL_STYLE:= manual do-install: ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/lib ifeq ($(ADK_NATIVE),y) - $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/usr/lib + $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib else - $(CP) ${STAGING_TARGET_DIR}/usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib + $(CP) ${STAGING_TARGET_DIR}/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 4c4cb447b..90b9f49f9 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -30,6 +30,9 @@ do-install: $(STAGING_TARGET_DIR)/lib/libc.so test -z $(ADK_RUNTIME_TIMEZONE) || \ grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \ cut -f 2 > $(IDIR_UCLIBC)/etc/TZ +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) + $(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_UCLIBC)/lib/ +endif $(CP) $(STAGING_TARGET_DIR)/lib/libc.so* $(IDIR_UCLIBC)/lib/ $(CP) $(STAGING_TARGET_DIR)/lib/libuClibc-$(PKG_VERSION).so \ $(IDIR_UCLIBC)/lib/ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index afb945000..b1ce84f98 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -86,6 +86,11 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_MINIMAL)/.configured: mkdir -p $(GCC_BUILD_DIR_MINIMAL) + # these symlinks are very important, do not remove + rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib + ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib (cd $(GCC_BUILD_DIR_MINIMAL); \ PATH='$(TARGET_PATH)' \ $(WRKBUILD)/configure \ |