diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-03-09 01:15:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-03-09 01:15:59 +0000 |
| commit | 1eb7b2098dd9b794a6ef35ad412121e93d390e61 (patch) | |
| tree | b2a583afce7e11e62ce34375e599c87df9a0fa42 | |
| parent | b47f37ab896d8d2fd8a1e906b62b755c158f01ba (diff) | |
| download | upstream-1eb7b2098dd9b794a6ef35ad412121e93d390e61.tar.gz upstream-1eb7b2098dd9b794a6ef35ad412121e93d390e61.tar.bz2 upstream-1eb7b2098dd9b794a6ef35ad412121e93d390e61.zip | |
prepend $(STAGING_DIR)/host to the PATH only in target-package stampfile targets, should fix usage of cross tools with host builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14800 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 4 | ||||
| -rw-r--r-- | rules.mk | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/package.mk b/include/package.mk index e33814e77d..8083632684 100644 --- a/include/package.mk +++ b/include/package.mk @@ -69,6 +69,7 @@ define Build/DefaultTargets $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)) $(call Build/Autoclean) + $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_PREPARED): @-rm -rf $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR) @@ -77,12 +78,14 @@ define Build/DefaultTargets $(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep)) touch $$@ + $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED) $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep)) $(Build/Configure) $(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep)) touch $$@ + $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_BUILT): $(STAMP_CONFIGURED) $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep)) $(Build/Compile) @@ -91,6 +94,7 @@ define Build/DefaultTargets $(foreach hook,$(Hooks/Install/Post),$(call $(hook))$(sep)) touch $$@ + $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_INSTALLED): $(STAMP_BUILT) $(SUBMAKE) -j1 clean-staging rm -rf $(TMP_DIR)/stage-$(PKG_NAME) @@ -65,7 +65,8 @@ TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD) DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD) -TARGET_PATH:=$(TOOLCHAIN_DIR)/usr/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/host/bin:$(PATH) +TARGET_PATH:=$(TOOLCHAIN_DIR)/usr/bin:$(STAGING_DIR_HOST)/bin:$(PATH) +TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH) TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include TARGET_LDFLAGS:=-L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib |