mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:11:46 +02:00
move TARGET_* flags from ./include/package-default.mk to ./rules.mk, remove EXTRA_* flags but still use them in configure and make
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8592 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
9a571e2771
commit
547fd77e20
@ -42,9 +42,6 @@ ifneq ($(strip $(PKG_UNPACK)),)
|
||||
endef
|
||||
endif
|
||||
|
||||
TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
|
||||
TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
|
||||
|
||||
CONFIGURE_ARGS = \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
@ -68,7 +65,7 @@ CONFIGURE_VARS = \
|
||||
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
||||
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
||||
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
|
||||
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
|
||||
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
|
||||
|
||||
@ -89,9 +86,9 @@ define Build/Configure/Default
|
||||
endef
|
||||
|
||||
MAKE_VARS = \
|
||||
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
||||
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
|
||||
LDFLAGS="$(EXTRA_LDFLAGS) "
|
||||
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
|
||||
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDCFLAGS)"
|
||||
|
||||
MAKE_FLAGS = \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
@ -106,5 +103,3 @@ define Build/Compile/Default
|
||||
$(MAKE_FLAGS) \
|
||||
$(1);
|
||||
endef
|
||||
|
||||
|
||||
|
6
rules.mk
6
rules.mk
@ -56,6 +56,8 @@ endif
|
||||
|
||||
TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/usr/bin:$(PATH)
|
||||
TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) -fhonour-copts
|
||||
TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
|
||||
TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
|
||||
|
||||
export PATH:=$(TARGET_PATH)
|
||||
|
||||
@ -82,10 +84,6 @@ ifneq ($(CONFIG_CCACHE),)
|
||||
TARGET_CC:= ccache $(TARGET_CC)
|
||||
endif
|
||||
|
||||
EXTRA_CPPFLAGS := -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
|
||||
EXTRA_CFLAGS := $(EXTRA_CPPFLAGS)
|
||||
EXTRA_LDFLAGS := -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
|
||||
|
||||
TARGET_CONFIGURE_OPTS:= \
|
||||
AR=$(TARGET_CROSS)ar \
|
||||
AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
|
||||
|
Loading…
Reference in New Issue
Block a user