use LIBGCC_S in more places
git-svn-id: svn://svn.openwrt.org/openwrt/packages@13896 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
c688b7d6c1
commit
a416df5369
@ -56,7 +56,7 @@ define Build/Compile
|
|||||||
-I$(PKG_BUILD_DIR)/gw6c/src/gw6c/platform/openwrt -I$(PKG_BUILD_DIR)/gw6c/src/gw6c" \
|
-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 \
|
LDFLAGS="-L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cconfig \
|
||||||
-L$(PKG_BUILD_DIR)/gw6c/src/gw6c/gw6cmessaging \
|
-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" \
|
target="openwrt" \
|
||||||
installdir="$(PKG_INSTALL_DIR)"
|
installdir="$(PKG_INSTALL_DIR)"
|
||||||
endef
|
endef
|
||||||
|
@ -37,7 +37,7 @@ CONFIGURE_VARS += \
|
|||||||
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
|
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \
|
||||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/uClibc++" \
|
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/uClibc++" \
|
||||||
LDFLAGS="$$$$LDFLAGS" \
|
LDFLAGS="$$$$LDFLAGS" \
|
||||||
LIBS="-nodefaultlibs -luClibc++ -lpthread -lgcc_s" \
|
LIBS="-nodefaultlibs -luClibc++ -lpthread $(LIBGCC_S)" \
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
$(call Build/Configure/Default,\
|
$(call Build/Configure/Default,\
|
||||||
|
@ -42,7 +42,7 @@ define Build/Compile
|
|||||||
$(PKG_BUILD_DIR)/src/util.cpp \
|
$(PKG_BUILD_DIR)/src/util.cpp \
|
||||||
$(PKG_BUILD_DIR)/src/msn_conntrack.cpp \
|
$(PKG_BUILD_DIR)/src/msn_conntrack.cpp \
|
||||||
$(PKG_BUILD_DIR)/src/msn_handlers.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
|
$(PKG_BUILD_DIR)/src/pcap_stuff.cpp
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ CONFIGURE_VARS += \
|
|||||||
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \
|
CXXFLAGS="$$$$CXXFLAGS -fno-builtin -I$(STAGING_DIR)/usr/include/uClibc++ -nostdinc++" \
|
||||||
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
|
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
|
||||||
LDFLAGS="$$$$LDFLAGS" \
|
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
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
|
@ -88,7 +88,7 @@ define Build/Compile
|
|||||||
$(TARGET_CONFIGURE_OPTS) \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \
|
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \
|
||||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
|
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 \
|
ac_cv_lib_cups_httpConnect=no \
|
||||||
samba_cv_FTRUNCATE_NEEDS_ROOT=no \
|
samba_cv_FTRUNCATE_NEEDS_ROOT=no \
|
||||||
samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \
|
samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \
|
||||||
|
@ -42,7 +42,7 @@ endef
|
|||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR)/software \
|
$(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++" \
|
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
|
all
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user