Commit d3361c66 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- If we are to build some libs then require them to exist. 

- Strip host files with host strip (untested, will likely need a HOSTSTRIP)
parent df23b568

toolchain/gcc/gcc-uclibc-3.x.mk

+9 −9
Original line number Diff line number Diff line
@@ -316,20 +316,20 @@ $(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed 
ifeq ($(BR2_GCC_SHARED_LIBGCC),y)

	# These are in /lib, so...

	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*

	-cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/

	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libgcc_s*

	cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/

	-strip --strip-unneeded $(TARGET_DIR)/lib/libgcc_s*

endif

ifeq ($(BR2_INSTALL_LIBSTDCPP),y)

	-cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/

	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libstdc++.so*

	cp -dpf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/

	-strip --strip-unneeded $(TARGET_DIR)/usr/lib/libstdc++.so*

endif

ifeq ($(BR2_INSTALL_LIBGCJ),y)

	-cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/usr/lib/

	-cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/usr/lib/

	-cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/usr/lib/

	cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/usr/lib/

	cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/usr/lib/

	cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/usr/lib/

	mkdir -p $(TARGET_DIR)/usr/lib/security

	-cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/

	-cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/

	cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/

	cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/

endif

	touch $@

toolchain/gcc/gcc-uclibc-4.x.mk

+7 −7
Original line number Diff line number Diff line
@@ -340,18 +340,18 @@ $(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed 
ifeq ($(BR2_GCC_SHARED_LIBGCC),y)

	# These are in /lib, so...

	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*

	-cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/

	cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s* $(TARGET_DIR)/lib/

endif

ifeq ($(BR2_INSTALL_LIBSTDCPP),y)

	-cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/

	cp -dpf $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libstdc++.so* $(TARGET_DIR)/usr/lib/

endif

ifeq ($(BR2_INSTALL_LIBGCJ),y)

	-cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/

	-cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/

	-cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/

	cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/

	cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/

	cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/

	mkdir -p $(TARGET_DIR)/usr/lib/security

	-cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/

	-cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/

	cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/

	cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/

endif

	touch $@