diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-12-13 17:27:40 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-12-13 22:02:32 +0100 |
| commit | 01b434b27a24652cf1ad2d77aeba8f55bac61e1c (patch) | |
| tree | f758a638f259c5c6bd80cf82d6f600a4bd88739e | |
| parent | 6c492d5e7be51e4f1031139883acd03f78881e49 (diff) | |
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | toolchain/helpers.mk | 9 | ||||
| -rw-r--r-- | toolchain/toolchain-crosstool-ng/Config.in | 6 | ||||
| -rw-r--r-- | toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 4 | ||||
| -rw-r--r-- | toolchain/toolchain-external/Config.in | 7 | ||||
| -rw-r--r-- | toolchain/toolchain-external/ext-tool.mk | 4 |
5 files changed, 4 insertions, 26 deletions
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 43c6db324..24f379d49 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -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; \ diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in index 4f305886b..4ee665dfb 100644 --- a/toolchain/toolchain-crosstool-ng/Config.in +++ b/toolchain/toolchain-crosstool-ng/Config.in @@ -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 diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk index 31797c487..1c5e86431 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk @@ -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},) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c2602d236..59fcb520d 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -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 diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 7a1791473..027fbbdf5 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -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}) ; \ |