use LIBGCC_S in more places
authorFelix Fietkau <nbd@openwrt.org>
Tue, 6 Jan 2009 16:16:47 +0000 (16:16 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 6 Jan 2009 16:16:47 +0000 (16:16 +0000)
SVN-Revision: 13896

ipv6/gw6c/Makefile
net/dansguardian/Makefile
net/imsnif/Makefile
net/lftp/Makefile
net/samba/Makefile
utils/avrusbboot/Makefile

index f972bdf..7cc94b0 100644 (file)
@@ -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
index 9e4ffd7..ee92996 100644 (file)
@@ -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,\
index 138d9a4..d6c21a4 100644 (file)
@@ -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
 
index ed81ce3..1790605 100644 (file)
@@ -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) \
index 1e3366c..47afe5d 100644 (file)
@@ -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 \
index 7313d52..780dbbe 100644 (file)
@@ -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