znc libc++ fix

SVN-Revision: 32970

diff --git a/net/znc/Makefile b/net/znc/Makefile
index 2db1124cbd9ee0bc80940deba7fd87ba61a0794b..b9c63ed77d1cf9735bfefdefcd60ab2a92f514f4 100644 (file)
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -30,7 +30,7 @@ endef
 
 define Package/znc
   $(Package/znc/default)
-  DEPENDS:=+libopenssl +uclibcxx
+  DEPENDS:=+libopenssl $(CXX_DEPENDS)
   MENU:=1
 endef
 
@@ -263,10 +263,10 @@ $(eval $(call webskin,ice))
 
 PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(ZNC_MODULES))
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 CONFIGURE_VARS += \
-       CXX="$(STAGING_DIR)/host/bin/g++-uc" \
        CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
        CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
        LDFLAGS="-nodefaultlibs -lc -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
@@ -277,9 +277,6 @@ CONFIGURE_ARGS += \
        --enable-extra \
        --disable-perl
 
-MAKE_FLAGS += \
-       CXX="$(STAGING_DIR)/host/bin/g++-uc"
-
 define Build/Configure
        $(call Build/Configure/Default,)
        $(call libtool_disable_rpath)