Commit 01b434b2 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

toolchain: remove toolchain-specific stripping 



We already handle the stripping of libraries in $(TARGET_DIR) at the
global level, so there's no need to have toolchain-specific option and
code for this.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 6c492d5e

toolchain/helpers.mk

+0 −9
Original line number Diff line number Diff line
@@ -15,13 +15,11 @@ 
# $1: arch specific sysroot directory

# $2: library name

# $3: destination directory of the libary, relative to $(TARGET_DIR)

# $4: strip (y|n), default is to strip

#

copy_toolchain_lib_root = \

	ARCH_SYSROOT_DIR="$(strip $1)"; \

	LIB="$(strip $2)"; \

	DESTDIR="$(strip $3)" ; \

	STRIP="$(strip $4)"; \

 \

	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \

		find -L . -path "./lib/$${LIB}.*"     -o \
@@ -39,13 +37,6 @@ copy_toolchain_lib_root = \ 
				cp -d $${FULLPATH} $(TARGET_DIR)/$${DESTDIR}/; \

			elif test -f $${FULLPATH}; then \

				$(INSTALL) -D -m0755 $${FULLPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIB}; \

				case "$${STRIP}" in \

				(0 | n | no) \

;; \

				(*) \

					$(TARGET_CROSS)strip "$(TARGET_DIR)/$${DESTDIR}/$${LIB}"; \

;; \

				esac; \

			else \

				exit -1; \

			fi; \

toolchain/toolchain-crosstool-ng/Config.in

+0 −6
Original line number Diff line number Diff line
@@ -98,10 +98,4 @@ config BR2_TOOLCHAIN_CTNG_uClibc_PROGRAM_INVOCATION 


endif # BR2_TOOLCHAIN_CTNG_uClibc



config BR2_TOOLCHAIN_CTNG_STRIP_LIBS

	bool "Strip libs copied to target"

	default !BR2_STRIP_none

	help

	  Strip shared libraries copied from the toolchain.



endif # BR2_TOOLCHAIN_CTNG

toolchain/toolchain-crosstool-ng/crosstool-ng.mk

+2 −2
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ $(STAMP_DIR)/ct-ng-toolchain-installed: $(STAMP_DIR)/ct-ng-toolchain-built 
	    echo "CTNG_SYSROOT='$${CTNG_SYSROOT}'";                         \

	    echo "Copy external toolchain libraries to target...";          \

	    for libs in $(CTNG_LIBS_LIB); do                                \

	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},$$libs,/lib,$(BR2_TOOLCHAIN_CTNG_STRIP_LIBS)); \

	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},$$libs,/lib); \

	    done;                                                           \

	    for libs in $(CTNG_LIBS_USR_LIB); do                            \

	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},$$libs,/usr/lib,$(BR2_TOOLCHAIN_CTNG_STRIP_LIBS)); \

	        $(call copy_toolchain_lib_root,$${CTNG_SYSROOT},$$libs,/usr/lib); \

	    done;                                                           \

	    echo "Copy external toolchain sysroot to staging...";           \

	    $(call copy_toolchain_sysroot,$${CTNG_SYSROOT},$${CTNG_SYSROOT},)

toolchain/toolchain-external/Config.in

+0 −7
Original line number Diff line number Diff line
@@ -218,12 +218,5 @@ endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC 


endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM



config BR2_TOOLCHAIN_EXTERNAL_STRIP

	bool

	default y

	prompt "Strip shared libraries"

	help

	  Strip shared libraries copied from the external toolchain.



endif # BR2_TOOLCHAIN_EXTERNAL

toolchain/toolchain-external/ext-tool.mk

+2 −2
Original line number Diff line number Diff line
@@ -184,10 +184,10 @@ $(STAMP_DIR)/ext-toolchain-installed: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES) 
	mkdir -p $(TARGET_DIR)/lib ; \

	echo "Copy external toolchain libraries to target..." ; \

	for libs in $(LIB_EXTERNAL_LIBS); do \

	 	$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$$libs,/lib,$(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \

		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$$libs,/lib); \

	done ; \

	for libs in $(USR_LIB_EXTERNAL_LIBS); do \

	 	$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$$libs,/usr/lib,$(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \

		$(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$$libs,/usr/lib); \

	done ; \

	echo "Copy external toolchain sysroot to staging..." ; \

	$(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR}) ; \