fix some misuses of the recently added EXTRA_{CFLAGS,CPPFLAGS,LDFLAGS} variables
git-svn-id: svn://svn.openwrt.org/openwrt/packages@6248 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -46,9 +46,9 @@ endef
|
|||||||
define Build/Configure
|
define Build/Configure
|
||||||
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
|
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
|
CPPFLAGS="$$$$CPPFLAGS $(EXTRA_CPPFLAGS)" \
|
||||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
|
LDFLAGS="$(EXTRA_LDFLAGS)" \
|
||||||
./configure \
|
./configure \
|
||||||
--target=$(GNU_TARGET_NAME) \
|
--target=$(GNU_TARGET_NAME) \
|
||||||
--host=$(GNU_TARGET_NAME) \
|
--host=$(GNU_TARGET_NAME) \
|
||||||
|
@ -38,7 +38,7 @@ endef
|
|||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(call Build/Compile/Default, \
|
$(call Build/Compile/Default, \
|
||||||
COPTS="\$$$$(EXTRA_CFLAGS)" \
|
COPTS="$(TARGET_CFLAGS)" \
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||||
INSTALL="install" \
|
INSTALL="install" \
|
||||||
all install \
|
all install \
|
||||||
|
@ -31,8 +31,8 @@ endef
|
|||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(call Build/Compile/Default, \
|
$(call Build/Compile/Default, \
|
||||||
CCOPTS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
CCOPTS="$(TARGET_CFLAGS)" \
|
||||||
INCLUDE="" \
|
INCLUDE="$(EXTRA_CPPFLAGS)" \
|
||||||
LDFLAGS="$(EXTRA_LDFLAGS)" \
|
LDFLAGS="$(EXTRA_LDFLAGS)" \
|
||||||
)
|
)
|
||||||
endef
|
endef
|
||||||
|
@ -35,8 +35,8 @@ endef
|
|||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(call Build/Compile/Default, \
|
$(call Build/Compile/Default, \
|
||||||
CFLAGS="\$$$$(EXTRA_CFLAGS)" \
|
CFLAGS="$(EXTRA_CFLAGS)" \
|
||||||
LDFLAGS="\$$$$(EXTRA_LDFLAGS)" \
|
LDFLAGS="$(EXTRA_LDFLAGS)" \
|
||||||
)
|
)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -37,8 +37,8 @@ endef
|
|||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(call Build/Compile/Default, \
|
$(call Build/Compile/Default, \
|
||||||
CFLAGS="\$$$$(EXTRA_CFLAGS)" \
|
CFLAGS="$(EXTRA_CFLAGS)" \
|
||||||
LDFLAGS="\$$$$(EXTRA_LDFLAGS)" \
|
LDFLAGS="$(EXTRA_LDFLAGS)" \
|
||||||
)
|
)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ endef
|
|||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(call Build/Compile/Default, \
|
$(call Build/Compile/Default, \
|
||||||
CFLAGS="$(TARGET_CFLAGS)" \
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
CPPFLAGS="$(EXTRA_CFLAGS)" \
|
CPPFLAGS="$(EXTRA_CPPFLAGS)" \
|
||||||
LDFLAGS="$(EXTRA_LDFLAGS)" \
|
LDFLAGS="$(EXTRA_LDFLAGS)" \
|
||||||
)
|
)
|
||||||
endef
|
endef
|
||||||
|
Reference in New Issue
Block a user