diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-08-01 12:01:18 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-08-01 12:01:18 +0000 |
| commit | 5df254664f787096e245f36027ea77a91dc5c3e9 (patch) | |
| tree | e191700cbc50a0bf6503d6b2b082696f368aad64 | |
| parent | 3cd753408d40878e2742ddec73a78c6b248264b4 (diff) | |
| download | upstream-5df254664f787096e245f36027ea77a91dc5c3e9.tar.gz upstream-5df254664f787096e245f36027ea77a91dc5c3e9.tar.bz2 upstream-5df254664f787096e245f36027ea77a91dc5c3e9.zip | |
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.
SVN-Revision: 32928
| -rw-r--r-- | package/uclibc++/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index ac5032b55d..c8bfc1f3bc 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 |