diff --git a/ipv6/gw6c/Makefile b/ipv6/gw6c/Makefile index f972bdf49..7cc94b020 100644 --- a/ipv6/gw6c/Makefile +++ b/ipv6/gw6c/Makefile @@ -56,7 +56,7 @@ define Build/Compile -I$(PKG_BUILD_DIR)/gw6c/src/gw6c/platform/openwrt -I$(PKG_BUILD_DIR)/gw6c/src/gw6c" \ LDFLAGS="-L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cconfig \ -L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cmessaging \ - -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -nodefaultlibs -luClibc++ -lgcc_s" \ + -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -nodefaultlibs -luClibc++ $(LIBGCC_S)" \ target="openwrt" \ installdir="$(PKG_INSTALL_DIR)" endef diff --git a/net/dansguardian/Makefile b/net/dansguardian/Makefile index 9e4ffd767..ee929965d 100644 --- a/net/dansguardian/Makefile +++ b/net/dansguardian/Makefile @@ -37,7 +37,7 @@ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/uClibc++" \ LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -luClibc++ -lpthread -lgcc_s" \ + LIBS="-nodefaultlibs -luClibc++ -lpthread $(LIBGCC_S)" \ define Build/Configure $(call Build/Configure/Default,\ diff --git a/net/imsnif/Makefile b/net/imsnif/Makefile index 138d9a46b..d6c21a4f7 100644 --- a/net/imsnif/Makefile +++ b/net/imsnif/Makefile @@ -42,7 +42,7 @@ define Build/Compile $(PKG_BUILD_DIR)/src/util.cpp \ $(PKG_BUILD_DIR)/src/msn_conntrack.cpp \ $(PKG_BUILD_DIR)/src/msn_handlers.cpp \ - -L$(STAGING_DIR)/usr/lib -nodefaultlibs -luClibc++ -lgcc_s -lpcap \ + -L$(STAGING_DIR)/usr/lib -nodefaultlibs -luClibc++ $(LIBGCC_S) -lpcap \ $(PKG_BUILD_DIR)/src/pcap_stuff.cpp endef diff --git a/net/lftp/Makefile b/net/lftp/Makefile index ed81ce3a2..179060594 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -44,7 +44,7 @@ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses -lgcc -lgcc_s -ldl" \ + LIBS="-nodefaultlibs -lz -lutil -luClibc++ -lcurses -lgcc $(LIBGCC_S) -ldl" \ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ diff --git a/net/samba/Makefile b/net/samba/Makefile index 1e3366c2e..47afe5dc4 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -88,7 +88,7 @@ define Build/Compile $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-lgcc_s -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ + LDFLAGS="$(LIBGCC_S) -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ ac_cv_lib_cups_httpConnect=no \ samba_cv_FTRUNCATE_NEEDS_ROOT=no \ samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \ diff --git a/utils/avrusbboot/Makefile b/utils/avrusbboot/Makefile index 7313d523a..780dbbe3b 100644 --- a/utils/avrusbboot/Makefile +++ b/utils/avrusbboot/Makefile @@ -42,7 +42,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR)/software \ CXX="$(TARGET_CROSS)g++ $(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/uClibc++" \ - LFLAGS="-L$(STAGING_DIR)/usr/lib -nodefaultlibs -luClibc++ -lusb -lgcc_s" \ + LFLAGS="-L$(STAGING_DIR)/usr/lib -nodefaultlibs -luClibc++ -lusb $(LIBGCC_S)" \ all endef