Commit 027ef3f2 authored by Markos Chandras's avatar Markos Chandras Committed by Peter Korsgaard
Browse files

gcc-final: Drop obsolete code for handling lib64 



Since 5628776c
"toolchain-external: fix lib64 symlinks"

lib64 is a symlink to lib so there is no reason to copy the libraries
to lib64 anymore. This fixes multiple building problems
for buildroot toolchains:

[...]
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libuClibc-0.9.33.2.so'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libuClibc-0.9.33.2.so'
are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil-0.9.33.2.so'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil-0.9.33.2.so'
are the same file
mv: 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64/libutil.so.0'
and 'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib/libutil.so.0'
are the same file
rmdir: failed to remove
'output/host/usr/mips64-buildroot-linux-uclibc/sysroot/lib64': Not a directory
[...]

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ca47afb4

package/gcc/gcc-final/gcc-final.mk

+0 −14
Original line number Diff line number Diff line
@@ -55,20 +55,6 @@ endif 
HOST_GCC_FINAL_CONF_OPT += \

	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))



# Handle lib64

define HOST_GCC_FINAL_HANDLE_LIB64

	if [ -d "$(STAGING_DIR)/lib64" ]; then \

		if [ ! -e "$(STAGING_DIR)/lib" ]; then \

			mkdir -p "$(STAGING_DIR)/lib"; \

		fi; \

		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \

		rmdir "$(STAGING_DIR)/lib64"; \

		rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\

	fi

endef



HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_HANDLE_LIB64



# Make sure we have 'cc'

define HOST_GCC_FINAL_CREATE_CC_SYMLINKS

	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \