From 5d30e6cb47c4e4105e2b9c4c28de6d34a0385923 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Fri, 4 Aug 2006 11:59:52 +0000
Subject: [PATCH] set PATH in rules.mk

SVN-Revision: 4438
---
 openwrt/include/kernel-build.mk       | 12 ++++++------
 openwrt/include/package.mk            |  4 ++--
 openwrt/package/busybox/Makefile      |  4 ++--
 openwrt/package/diag/Makefile         |  1 -
 openwrt/package/fuse/Makefile         |  1 -
 openwrt/package/iptables/Makefile     |  8 ++++----
 openwrt/package/libpcap/Makefile      |  1 -
 openwrt/package/madwifi/Makefile      |  1 -
 openwrt/package/mini_fo/Makefile      |  1 -
 openwrt/package/openssl/Makefile      |  1 -
 openwrt/package/shfs/Makefile         |  1 -
 openwrt/package/switch/Makefile       |  1 -
 openwrt/package/wlcompat/Makefile     |  2 --
 openwrt/rules.mk                      | 14 ++++++++------
 openwrt/toolchain/gcc/Makefile        | 12 ++++++------
 openwrt/toolchain/libnotimpl/Makefile |  4 ++--
 16 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/openwrt/include/kernel-build.mk b/openwrt/include/kernel-build.mk
index 0f29a306bf..9af1142d33 100644
--- a/openwrt/include/kernel-build.mk
+++ b/openwrt/include/kernel-build.mk
@@ -34,7 +34,7 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
 ifeq ($(KERNEL),2.4)
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
 	$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
-	PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
 	touch $@
 
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
@@ -44,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-	PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
 	touch $@
 endif
 
@@ -63,16 +63,16 @@ else
 endif
 
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
-	PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH)
+	$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH)
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
-	PATH="$(TARGET_PATH)" $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
+	$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
 	touch -c $(LINUX_KERNEL)
 
 $(LINUX_DIR)/.modules_done:
 	rm -rf $(KERNEL_BUILD_DIR)/modules
-	PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules
-	PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules
+	$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
 	touch $(LINUX_DIR)/.modules_done
 
 modules: $(LINUX_DIR)/.modules_done
diff --git a/openwrt/include/package.mk b/openwrt/include/package.mk
index 79c29bccf6..385a846537 100644
--- a/openwrt/include/package.mk
+++ b/openwrt/include/package.mk
@@ -251,11 +251,11 @@ endef
 define Build/Configure/Default
 	@(cd $(PKG_BUILD_DIR)/$(3); \
 	[ -x configure ] && \
-		$(2) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		$(2) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -283,7 +283,7 @@ define Build/Configure
 endef
 
 define Build/Compile/Default
-	PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CROSS="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
diff --git a/openwrt/package/busybox/Makefile b/openwrt/package/busybox/Makefile
index 67f7ce1816..6a359688a5 100644
--- a/openwrt/package/busybox/Makefile
+++ b/openwrt/package/busybox/Makefile
@@ -38,12 +38,12 @@ endef
 
 define Build/Configure
 	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
-	yes '' | PATH="$(TARGET_PATH)" $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
+	yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
 	-C $(PKG_BUILD_DIR) oldconfig
 endef
 
 define Package/busybox/install
-	PATH="$(TARGET_PATH)" $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
+	$(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
 	PREFIX="$(1)" EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
 	-rm -rf $(1)/lib64
 endef
diff --git a/openwrt/package/diag/Makefile b/openwrt/package/diag/Makefile
index 024426f8b1..3ffd2f460f 100644
--- a/openwrt/package/diag/Makefile
+++ b/openwrt/package/diag/Makefile
@@ -35,7 +35,6 @@ define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
-		PATH="$(TARGET_PATH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="-DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include" \
 		modules
diff --git a/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile
index f690f56fa7..fd55c71dc7 100644
--- a/openwrt/package/fuse/Makefile
+++ b/openwrt/package/fuse/Makefile
@@ -82,7 +82,6 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		PATH="$(TARGET_PATH)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile
index bf8124084c..8d77fb43f4 100644
--- a/openwrt/package/iptables/Makefile
+++ b/openwrt/package/iptables/Makefile
@@ -161,9 +161,9 @@ endef
 define Build/Compile
 	chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
 	mkdir -p $(PKG_INSTALL_DIR)
-	PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
+		COPT_FLAGS="$(TARGET_CFLAGS)" \
 		KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install install-devel
@@ -171,9 +171,9 @@ endef
 
 
 define Build/InstallDev
-	PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
+		COPT_FLAGS="$(TARGET_CFLAGS)" \
 		KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
 		DESTDIR="$(STAGING_DIR)" \
 		install install-devel
diff --git a/openwrt/package/libpcap/Makefile b/openwrt/package/libpcap/Makefile
index 155748a472..1d9d4371fb 100644
--- a/openwrt/package/libpcap/Makefile
+++ b/openwrt/package/libpcap/Makefile
@@ -71,7 +71,6 @@ define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
-		PATH=$(TARGET_PATH) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
diff --git a/openwrt/package/madwifi/Makefile b/openwrt/package/madwifi/Makefile
index 96ca1baf36..380ec4ad61 100644
--- a/openwrt/package/madwifi/Makefile
+++ b/openwrt/package/madwifi/Makefile
@@ -50,7 +50,6 @@ ifeq ($(findstring PCI,$(BUS)),PCI)
 endif
 
 MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
-		PATH="$(TARGET_PATH)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		CC="$(TARGET_CC)" \
diff --git a/openwrt/package/mini_fo/Makefile b/openwrt/package/mini_fo/Makefile
index 6cba9db170..2e98efffda 100644
--- a/openwrt/package/mini_fo/Makefile
+++ b/openwrt/package/mini_fo/Makefile
@@ -33,7 +33,6 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		PATH="$(TARGET_PATH)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		KERNELVERSION="$(KERNEL)" \
diff --git a/openwrt/package/openssl/Makefile b/openwrt/package/openssl/Makefile
index bbbd2073ed..be5b4a6d06 100644
--- a/openwrt/package/openssl/Makefile
+++ b/openwrt/package/openssl/Makefile
@@ -52,7 +52,6 @@ define Build/Configure
 	$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
 	$(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure
 	(cd $(PKG_BUILD_DIR); \
-		PATH=$(TARGET_PATH) \
 		./Configure linux-openwrt \
 		  --prefix=/usr \
 		  --openssldir=/etc/ssl \
diff --git a/openwrt/package/shfs/Makefile b/openwrt/package/shfs/Makefile
index 63a1108e6f..dbaca66913 100644
--- a/openwrt/package/shfs/Makefile
+++ b/openwrt/package/shfs/Makefile
@@ -43,7 +43,6 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
-		PATH="$(TARGET_PATH)" \
 		OFLAGS="$(TARGET_CFLAGS)" \
 		CC="$(TARGET_CC)" \
 		LINKER="$(TARGET_CC)" \
diff --git a/openwrt/package/switch/Makefile b/openwrt/package/switch/Makefile
index 860e530c4c..8b5e7b324c 100644
--- a/openwrt/package/switch/Makefile
+++ b/openwrt/package/switch/Makefile
@@ -35,7 +35,6 @@ define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
-		PATH="$(TARGET_PATH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="-DBCMGPIO2" \
 		modules
diff --git a/openwrt/package/wlcompat/Makefile b/openwrt/package/wlcompat/Makefile
index a42cdd2050..d3ccf88101 100644
--- a/openwrt/package/wlcompat/Makefile
+++ b/openwrt/package/wlcompat/Makefile
@@ -46,7 +46,6 @@ define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
-		PATH="$(TARGET_PATH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="-DDEBUG -I$(LINUX_DIR)/arch/mips/bcm947xx/include -I$(PKG_BUILD_DIR)/include" \
 		modules
@@ -54,7 +53,6 @@ define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
-		PATH="$(TARGET_PATH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		EXTRA_CFLAGS="-I$(LINUX_DIR)/arch/mips/bcm947xx/include -I$(PKG_BUILD_DIR)/include" \
 		modules
diff --git a/openwrt/rules.mk b/openwrt/rules.mk
index 2cd8ea9b25..6c770c48a7 100644
--- a/openwrt/rules.mk
+++ b/openwrt/rules.mk
@@ -39,9 +39,11 @@ KERNEL_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 
-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
+TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 
+export PATH:=$(TARGET_PATH)
+
 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 
@@ -54,7 +56,9 @@ SED:=$(STAGING_DIR)/bin/sed -i -e
 CP:=cp -fpR
 
 ifneq ($(CONFIG_CCACHE),)
-  TARGET_CC:=CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH) ccache $(TARGET_CC)
+  # FIXME: move this variable to a better location
+  export CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH)
+  TARGET_CC:= ccache $(TARGET_CC)
 endif
 
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
@@ -73,9 +77,8 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 GNU_HOST_NAME:=$(HOST_ARCH)-pc-linux-gnu
 
 TARGET_CONFIGURE_OPTS:= \
-  PATH=$(TARGET_PATH) \
   AR=$(TARGET_CROSS)ar \
-  AS=$(TARGET_CROSS)as \
+  AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
   LD=$(TARGET_CROSS)ld \
   NM=$(TARGET_CROSS)nm \
   CC="$(TARGET_CC)" \
@@ -88,7 +91,6 @@ TARGET_CONFIGURE_OPTS:= \
 RSTRIP:= \
   STRIP="$(STRIP)" \
   STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
-  PATH=$(TARGET_PATH) \
   $(SCRIPT_DIR)/rstrip.sh
 
 # where to build (and put) .ipk packages
@@ -101,7 +103,7 @@ IPKG:= \
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
-  PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root
+  ipkg-build -c -o root -g root
 
 ifeq ($(CONFIG_ENABLE_LOCALE),true)
   DISABLE_NLS:=
diff --git a/openwrt/toolchain/gcc/Makefile b/openwrt/toolchain/gcc/Makefile
index a13ab2ebf7..85691e6a8e 100644
--- a/openwrt/toolchain/gcc/Makefile
+++ b/openwrt/toolchain/gcc/Makefile
@@ -48,7 +48,7 @@ BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-final
 
 define Stage1/Configure
 	mkdir -p $(BUILD_DIR1)
-	(cd $(BUILD_DIR1); rm -f config.cache; PATH=$(TARGET_PATH) \
+	(cd $(BUILD_DIR1); rm -f config.cache; \
 		$(PKG_BUILD_DIR)/configure \
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
@@ -64,10 +64,10 @@ define Stage1/Configure
 	);
 endef
 define Stage1/Compile
-	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR1) all-gcc
+	$(MAKE) -C $(BUILD_DIR1) all-gcc
 endef
 define Stage1/Install
-	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR1) install-gcc
+	$(MAKE) -C $(BUILD_DIR1) install-gcc
 endef
 
 define Stage2/Configure
@@ -77,7 +77,7 @@ define Stage2/Configure
 	ln -sf ../include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
 	rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
 	ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
-	(cd $(BUILD_DIR2); rm -f config.cache; PATH=$(TARGET_PATH) \
+	(cd $(BUILD_DIR2); rm -f config.cache; \
 		$(PKG_BUILD_DIR)/configure \
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
@@ -92,10 +92,10 @@ define Stage2/Configure
 	);
 endef
 define Stage2/Compile
-	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR2) all
+	$(MAKE) -C $(BUILD_DIR2) all
 endef
 define Stage2/Install
-	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR2) install
+	$(MAKE) -C $(BUILD_DIR2) install
 	echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
diff --git a/openwrt/toolchain/libnotimpl/Makefile b/openwrt/toolchain/libnotimpl/Makefile
index 214f51c5dc..bc515ca080 100644
--- a/openwrt/toolchain/libnotimpl/Makefile
+++ b/openwrt/toolchain/libnotimpl/Makefile
@@ -12,7 +12,7 @@ PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/libnotimpl
 include $(INCLUDE_DIR)/host-build.mk
 
 define cc
-	PATH="$(TARGET_PATH)" $(TARGET_CC) $(TARGET_CFLAGS) -c src/$(1).c -o $(PKG_BUILD_DIR)/$(1).o
+	$(TARGET_CC) $(TARGET_CFLAGS) -c src/$(1).c -o $(PKG_BUILD_DIR)/$(1).o
 endef
 
 define Build/Prepare
@@ -22,7 +22,7 @@ endef
 
 define Build/Compile
 	$(call cc,math)
-	PATH="$(TARGET_PATH)" $(TARGET_CROSS)ar rc $(PKG_BUILD_DIR)/libnotimpl.a $(PKG_BUILD_DIR)/*.o
+	$(TARGET_CROSS)ar rc $(PKG_BUILD_DIR)/libnotimpl.a $(PKG_BUILD_DIR)/*.o
 endef
 
 define Build/Install