diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-03-24 20:54:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-24 20:54:33 +0000 |
| commit | 036a419fe1f7f5b6b731be21ecbe51b3d620b590 (patch) | |
| tree | 95074d8c380b632fd2611e7cb1d1778b73aee56f | |
| parent | 19358682eb8cab4243d51297828444482f533fc8 (diff) | |
| download | upstream-036a419fe1f7f5b6b731be21ecbe51b3d620b590.tar.gz upstream-036a419fe1f7f5b6b731be21ecbe51b3d620b590.tar.bz2 upstream-036a419fe1f7f5b6b731be21ecbe51b3d620b590.zip | |
use recursive variable expansion for CONFIGURE_*, MAKE_* variables in the package build so that TARGET_*FLAGS changes also apply
SVN-Revision: 6678
| -rw-r--r-- | include/package-defaults.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 3f3b33ee8b..3ec313bd94 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -42,10 +42,10 @@ 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 +TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include +TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -CONFIGURE_ARGS := \ +CONFIGURE_ARGS = \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ @@ -63,7 +63,7 @@ CONFIGURE_ARGS := \ --infodir=/usr/info \ $(DISABLE_NLS) -CONFIGURE_VARS:= \ +CONFIGURE_VARS = \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ @@ -72,7 +72,7 @@ CONFIGURE_VARS:= \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" -CONFIGURE_PATH:=. +CONFIGURE_PATH = . define Build/Configure/Default (cd $(PKG_BUILD_DIR)/$(strip $(3)); \ @@ -86,12 +86,12 @@ define Build/Configure/Default ) endef -MAKE_VARS := \ +MAKE_VARS = \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ LDFLAGS="$(EXTRA_LDFLAGS) " -MAKE_FLAGS := \ +MAKE_FLAGS = \ $(TARGET_CONFIGURE_OPTS) \ CROSS="$(TARGET_CROSS)" \ ARCH="$(ARCH)" |