From 14a71561a388196edbcddfa72d281e911c06266f Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 1 Oct 2007 16:15:31 +0000 Subject: - just use the strip binary to avoid confusing libtool (quotes) - use $(STRIPCMD) in packages to avoid clashes with $(STRIP) --- toolchain/binutils/binutils.mk | 4 ++-- toolchain/gcc/gcc-uclibc-3.x.mk | 10 +++++----- toolchain/gcc/gcc-uclibc-4.x.mk | 10 +++++----- toolchain/gdb/gdb.mk | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'toolchain') diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index ab69cbc06..bede4ef3d 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -175,8 +175,8 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump -C $(BINUTILS_DIR2) install #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc - -$(STRIP) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 - -$(STRIP) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 + -$(STRIPCMD) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 + -$(STRIPCMD) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 binutils_target: $(BINUTILS_TARGET_PREREQ) $(TARGET_DIR)/usr/bin/ld diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index cac009e53..3e530795e 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -467,11 +467,11 @@ endif # # Ok... that's enough of that. # - -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIP) cc1 cc1plus collect2 > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/lib && $(STRIP) libstdc++.so.*.*.* > /dev/null 2>&1) - -(cd $(TARGET_DIR)/lib && $(STRIP) libgcc_s*.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1) # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index cdf32bc3f..55362ecb6 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -468,11 +468,11 @@ endif # # Ok... that's enough of that. # - -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIP) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIP) cc1 cc1plus collect2 > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/lib && $(STRIP) libstdc++.so.*.*.* > /dev/null 2>&1) - -(cd $(TARGET_DIR)/lib && $(STRIP) libgcc_s*.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1) + -(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1) + -(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1) # rm -f $(TARGET_DIR)/usr/lib/*.la* #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 58934b846..864dd1c55 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -114,7 +114,7 @@ endif $(GDB_TARGET_DIR)/gdb/gdb: $(GDB_TARGET_DIR)/.configured $(MAKE) CC=$(TARGET_CC) MT_CFLAGS="$(TARGET_CFLAGS)" \ -C $(GDB_TARGET_DIR) - $(STRIP) $(GDB_TARGET_DIR)/gdb/gdb + $(STRIPCMD) $(GDB_TARGET_DIR)/gdb/gdb $(TARGET_DIR)/usr/bin/gdb: $(GDB_TARGET_DIR)/gdb/gdb install -c -D $(GDB_TARGET_DIR)/gdb/gdb $(TARGET_DIR)/usr/bin/gdb @@ -168,7 +168,7 @@ $(GDB_SERVER_DIR)/.configured: $(GDB_DIR)/.unpacked $(GDB_SERVER_DIR)/gdbserver: $(GDB_SERVER_DIR)/.configured $(MAKE) CC=$(TARGET_CC) MT_CFLAGS="$(TARGET_CFLAGS)" \ -C $(GDB_SERVER_DIR) - $(STRIP) $(GDB_SERVER_DIR)/gdbserver + $(STRIPCMD) $(GDB_SERVER_DIR)/gdbserver $(TARGET_DIR)/usr/bin/gdbserver: $(GDB_SERVER_DIR)/gdbserver ifeq ($(strip $(BR2_CROSS_TOOLCHAIN_TARGET_UTILS)),y) mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils -- cgit v1.2.3