Commit 8e650f6e authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Allow library copy to fail

parent 8ff3fc88

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

+2 −2
Original line number Diff line number Diff line
@@ -332,13 +332,13 @@ $(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* \

	-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)

ifeq ($(BR2_GCC_SHARED_LIBGCC),y)

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

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

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

endif

endif

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

+2 −2
Original line number Diff line number Diff line
@@ -345,12 +345,12 @@ $(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* \

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

		$(TARGET_DIR)/lib/

endif

ifeq ($(BR2_INSTALL_LIBSTDCPP),y)

ifeq ($(BR2_GCC_SHARED_LIBGCC),y)

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

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

		$(TARGET_DIR)/usr/lib/

endif

endif