diff options
Diffstat (limited to 'toolchain/gcc')
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 081e906c8..981026fff 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -261,8 +261,11 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)  	mkdir -p $(GCC_BUILD_DIR2)  	# Important! Required for limits.h to be fixed.  	ln -snf ../include/ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include -	#-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib -	#ln -snf ../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib +	-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib +	mkdir -p $(STAGING_DIR)/lib +	ln -snf ../../lib $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib +	$(if $(BR2_ARCH_IS_64),mkdir -p $(STAGING_DIR)/lib64) +	$(if $(BR2_ARCH_IS_64),ln -snf ../../lib64 $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64)  	(cd $(GCC_BUILD_DIR2); rm -rf config.cache; \  		$(HOST_CONFIGURE_OPTS) \  		$(GCC_SRC_DIR)/configure $(QUIET) \ @@ -307,6 +310,7 @@ $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled  		fi; \  		mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \  		rmdir "$(STAGING_DIR)/lib64"; \ +		rm "$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib64";\  	fi  	# Strip the host binaries  ifeq ($(GCC_STRIP_HOST_BINARIES),true)  | 
