Sfoglia il codice sorgente

these symlinks are required

Waldemar Brodkorb 14 anni fa
parent
commit
0de5d9eced
3 ha cambiato i file con 10 aggiunte e 2 eliminazioni
  1. 2 2
      package/libstdcxx/Makefile
  2. 3 0
      package/uclibc/Makefile
  3. 5 0
      toolchain/gcc/Makefile

+ 2 - 2
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

+ 3 - 0
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/

+ 5 - 0
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 \