fix uclibc++ build
authorFelix Fietkau <nbd@openwrt.org>
Sun, 23 Dec 2007 23:15:15 +0000 (23:15 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 23 Dec 2007 23:15:15 +0000 (23:15 +0000)
SVN-Revision: 9885

libs/uclibc++/Makefile

index 3202e0c602e54f498d30e9764ba690a63ade22b3..5c49d6306635be6e41421444be21dfb62830750a 100644 (file)
@@ -73,15 +73,15 @@ define Build/InstallDev
        $(SED) 's|-I/include/|-I$(1)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
        $(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(2)/bin/g++-uc
 # add another wrapper which links against both uClibc++ and libstdc++ 
-       $(INSTALL_BIN) $(1)/usr/bin/g++-uc $(2)/bin/g++-uc+std
+       $(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
 endef
        
 define Build/UninstallDev
-       rm -rf $(2)/usr/bin/g++-uc \
-               $(2)/usr/bin/g++-uc+std \
+       rm -rf $(2)/bin/g++-uc \
+               $(2)/bin/g++-uc+std \
                $(1)/usr/include/uClibc++ \
                $(1)/usr/lib/libuClibc++*.{a,so*}
 endef