From 82d52e8d84ab2d54bcc23cb6893517055c1ad5c3 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Mon, 3 Sep 2007 06:10:01 +0000 Subject: [PATCH] Cleanup handling of gccbug script --- toolchain/gcc/gcc-uclibc-3.x.mk | 2 +- toolchain/gcc/gcc-uclibc-4.x.mk | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 1dff9ebedc..a21e9a0ada 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -282,7 +282,7 @@ $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled fi # Strip the host binaries ifeq ($(GCC_STRIP_HOST_BINARIES),true) - -strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/* + strip --strip-all -R .note -R .comment $(filter-out -gccbug,$(wildcard $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-*)) endif # Make sure we have 'cc'. if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ]; then \ diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index a420c7fac0..c6f9df056a 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -288,13 +288,9 @@ $(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \ rmdir "$(STAGING_DIR)/lib64"; \ fi - # Move gcc bug reporting script out of path of real executables - mv -f $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gccbug \ - $(STAGING_DIR)/usr/bin/$(GNU_TARGET_NAME)-gccbug # Strip the host binaries ifeq ($(GCC_STRIP_HOST_BINARIES),true) strip --strip-all -R .note -R .comment $(filter-out -gccbug,$(wildcard $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-*)) - -strip --strip-all -R .note -R .comment $(STAGING_DIR)/usr/bin/faked endif # Make sure we have 'cc'. if [ ! -e $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-cc ]; then \ -- 2.30.2