Commit 90c5d156 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

toolchain/gcc: ensure libraries are copied to target_dir for x86-64 



x86-64 stores libgcc_s / libstdc++ / libgcj under lib64 instead of lib,
so make sure that directory is searched as well for libraries to copy
to target.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 0a74a04e

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

+3 −3
Original line number Diff line number Diff line
@@ -351,20 +351,20 @@ $(PROJECT_BUILD_DIR)/autotools-stamps/gcc_libs_target_installed: $(GCC_BUILD_DIR 
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/

	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgcc_s*

endif

ifeq ($(BR2_INSTALL_LIBSTDCPP),y)

ifeq ($(BR2_GCC_SHARED_LIBGCC),y)

	mkdir -p $(TARGET_DIR)/usr/lib

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

	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libstdc++.so*

endif

endif

ifeq ($(BR2_INSTALL_LIBGCJ),y)

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

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

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

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

		$(TARGET_DIR)/usr/lib/security/