From 8b940d05d7f928ddd337d3589c91301a9984bfe3 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 4 Sep 2007 07:51:47 +0000
Subject: [PATCH] uClibc++: really really fix ccache issue

SVN-Revision: 8605
---
 libs/uclibc++/Makefile                       |  2 --
 libs/uclibc++/patches/004-ccache_fixes.patch | 24 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 libs/uclibc++/patches/004-ccache_fixes.patch

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 0bef00829a..17716ba7e6 100644
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -55,8 +55,6 @@ define Build/Configure
 	else \
 		cp ./files/config.default $(PKG_BUILD_DIR)/.config; \
 	fi
-	# fix ccache issue
-	$(SED) 's,$$$$CC,$(TARGET_CROSS)gcc,g' $(PKG_BUILD_DIR)/scripts/find_lib*.sh
 endef
 
 define Build/Compile
diff --git a/libs/uclibc++/patches/004-ccache_fixes.patch b/libs/uclibc++/patches/004-ccache_fixes.patch
new file mode 100644
index 0000000000..10ceb792ba
--- /dev/null
+++ b/libs/uclibc++/patches/004-ccache_fixes.patch
@@ -0,0 +1,24 @@
+diff -ruN uClibc++-0.2.2-old/src/abi/libgcc_eh/Makefile uClibc++-0.2.2-new/src/abi/libgcc_eh/Makefile
+--- uClibc++-0.2.2-old/src/abi/libgcc_eh/Makefile	2007-06-04 00:51:13.000000000 +0200
++++ uClibc++-0.2.2-new/src/abi/libgcc_eh/Makefile	2007-09-03 21:51:07.000000000 +0200
+@@ -16,7 +16,7 @@
+ #
+ #else
+ #	echo Binary
+-	$(AR) x $(shell CC=$(CC) $(TOPDIR)/scripts/find_libgcc_eh.sh)
++	$(AR) x $(shell CC="$(CC)" $(TOPDIR)/scripts/find_libgcc_eh.sh)
+ #endif
+ #endif
+ 
+diff -ruN uClibc++-0.2.2-old/src/abi/libsupc/Makefile uClibc++-0.2.2-new/src/abi/libsupc/Makefile
+--- uClibc++-0.2.2-old/src/abi/libsupc/Makefile	2007-06-04 00:51:13.000000000 +0200
++++ uClibc++-0.2.2-new/src/abi/libsupc/Makefile	2007-09-03 21:51:17.000000000 +0200
+@@ -14,7 +14,7 @@
+ #
+ #else
+ #	echo Binary
+-	$(AR) x $(shell CC=$(CC) $(TOPDIR)/scripts/find_libsupc.sh)
++	$(AR) x $(shell CC="$(CC)" $(TOPDIR)/scripts/find_libsupc.sh)
+ 	$(RM) -f new_op*.o del_op*.o pure.o new_handler.o eh_alloc.o eh_globals.o
+ #
+ #endif
-- 
2.30.2