[packages] more gcc 4.6 compilation fixes
git-svn-id: svn://svn.openwrt.org/openwrt/packages@30548 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
ad4ae62bf0
commit
3f88ab94a9
@ -47,7 +47,7 @@ define Build/Compile
|
|||||||
CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS) -fno-builtin -fno-rtti -nostdinc++ \
|
CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS) -fno-builtin -fno-rtti -nostdinc++ \
|
||||||
-I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
|
-I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \
|
||||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||||
LIBS="-nodefaultlibs -lc -luClibc++ -lconfuse" \
|
LIBS="-nodefaultlibs -lc -luClibc++ -lconfuse $(LIBGCC_S)" \
|
||||||
ndppd
|
ndppd
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ CONFIGURE_VARS += \
|
|||||||
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
|
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
|
||||||
LDFLAGS="$$$$LDFLAGS" \
|
LDFLAGS="$$$$LDFLAGS" \
|
||||||
LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S)" \
|
LIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S)" \
|
||||||
CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \
|
CLIENTCLIBS="-nodefaultlibs -lc -luClibc++ -lm $(LIBGCC_S)" \
|
||||||
libnl1_LIBS="-libnl-tiny"
|
libnl1_LIBS="-libnl-tiny"
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
|
@ -48,8 +48,8 @@ $(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
|
|||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
CC="$(TARGET_CC)" \
|
CC="$(TARGET_CC)" \
|
||||||
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \
|
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \
|
||||||
LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc $(4) -luClibc++ -lm -lutil" \
|
LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lc $(4) -luClibc++ -lm -lutil $(LIBGCC_S)" \
|
||||||
LDFLAGSNOSSL="$(TARGET_LDFLAGS) -nodefaultlibs $(4) -luClibc++ -lm -lutil" \
|
LDFLAGSNOSSL="$(TARGET_LDFLAGS) -nodefaultlibs -lc $(4) -luClibc++ -lm -lutil $(LIBGCC_S)" \
|
||||||
$(3)
|
$(3)
|
||||||
( cd $(PKG_BUILD_DIR); mv -f rrs rrs-$(2); )
|
( cd $(PKG_BUILD_DIR); mv -f rrs rrs-$(2); )
|
||||||
touch $$@
|
touch $$@
|
||||||
|
Loading…
x
Reference in New Issue
Block a user