From 07a9941eca74540332f7cd99d77a107fa2fe954b Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 10 Aug 2005 03:02:06 +0000
Subject: add support for multiple target arch, fix building with make -C
 package/uclibc++

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1592 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/uclibc++/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'package/uclibc++/Makefile')

diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 2dac7a7ff..0b4c5eaff 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -32,14 +32,14 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
 )
 
 $(PKG_BUILD_DIR)/.configured:
-	cp ./uclibc++.config $(PKG_BUILD_DIR)/.config
-	$(SED) 's,^.*TARGET_ARCH.*,TARGET_ARCH="$(UCLIBC_TARGET_ARCH)",g' $(PKG_BUILD_DIR)/.config
-	$(SED) 's,^.*ARCH_CFLAGS.*,ARCH_CFLAGS="-mno-split-addresses $(TARGET_CFLAGS)",g' $(PKG_BUILD_DIR)/.config
+	cp ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		TOPDIR="$(PKG_BUILD_DIR)/" \
 		$(TARGET_CONFIGURE_OPTS) \
+		ARCH_CFLAGS="$(TARGET_CFLAGS)" \
 		CROSS="$(TARGET_CROSS)" \
 		all
 	touch $@
@@ -54,6 +54,9 @@ $(IPKG_UCLIBCXX):
 compile: install-dev
 install-dev: $(PKG_BUILD_DIR)/.built
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) CROSS="$(TARGET_CROSS)" \
+		TOPDIR="$(PKG_BUILD_DIR)/" \
+		$(TARGET_CONFIGURE_OPTS) \
+		ARCH_CFLAGS="$(TARGET_CFLAGS)" \
+		CROSS="$(TARGET_CROSS)" \
 		DESTDIR="$(STAGING_DIR)" \
 		install
-- 
cgit v1.2.3