From 3d46f81fe053a546cd7a368cf84cf9dac31807d9 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 1 Aug 2012 12:01:18 +0000 Subject: [package] uclibc++: stage g++-uc wrappers in $(TOOLCHAIN_DIR) Since we are overriding TARGET_CXX with the g++-uc wrapper when we use cmake it expects to find g++-uc in the TOOLCHAIN_DIR. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32928 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/uclibc++/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package/uclibc++') diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index ac5032b55..c8bfc1f3b 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -70,16 +70,16 @@ endef define Build/InstallDev $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(2)/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/ $(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include/uClibc++/ $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++*.{a,so}* $(1)/usr/lib/ - $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc - $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc + $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(TOOLCHAIN_DIR)/bin/g++-uc + $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(TOOLCHAIN_DIR)/bin/g++-uc # add another wrapper which links against both uClibc++ and libstdc++ - $(INSTALL_BIN) $(2)/bin/g++-uc $(2)/bin/g++-uc+std - $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(2)/bin/g++-uc+std - $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(2)/bin/g++-uc+std - $(SED) 's|-nostdinc++||g' $(2)/bin/g++-uc+std + $(INSTALL_BIN) $(TOOLCHAIN_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/g++-uc+std + $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std + $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(TOOLCHAIN_DIR)/bin/g++-uc+std + $(SED) 's|-nostdinc++||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std endef define Package/uclibcxx/install -- cgit v1.2.3