aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2006-08-04 09:14:20 +0000
committerMike Baker <mbm@openwrt.org>2006-08-04 09:14:20 +0000
commit834f9176191f8a245cd1bc856e37f99e94b47f6f (patch)
tree01d7795a5a4f775f07954784496c37d2091ed565
parenta4a9ba8874ca977095ae4314253c5ae3420f270a (diff)
downloadupstream-834f9176191f8a245cd1bc856e37f99e94b47f6f.tar.gz
upstream-834f9176191f8a245cd1bc856e37f99e94b47f6f.tar.bz2
upstream-834f9176191f8a245cd1bc856e37f99e94b47f6f.zip
fix everything I broke with the previous patches
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4436 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package.mk2
-rw-r--r--package/busybox/Makefile7
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/iptables/Makefile4
-rw-r--r--rules.mk3
-rw-r--r--toolchain/libnotimpl/Makefile4
-rw-r--r--toolchain/uClibc/Makefile4
7 files changed, 14 insertions, 12 deletions
diff --git a/include/package.mk b/include/package.mk
index fee715043c..79c29bccf6 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -283,7 +283,7 @@ define Build/Configure
endef
define Build/Compile/Default
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ PATH=$(TARGET_PATH) $(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/package/busybox/Makefile b/package/busybox/Makefile
index afe7c59e3f..67f7ce1816 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -38,12 +38,13 @@ endef
define Build/Configure
$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
- yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" -C $(PKG_BUILD_DIR) oldconfig
+ yes '' | PATH="$(TARGET_PATH)" $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \
+ -C $(PKG_BUILD_DIR) oldconfig
endef
define Package/busybox/install
- $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" PREFIX="$(1)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
+ PATH="$(TARGET_PATH)" $(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/package/dropbear/Makefile b/package/dropbear/Makefile
index cfb2c4135e..9ffc782d94 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -82,10 +82,12 @@ endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
+ LD="$(TARGET_CC)" \
PROGRAMS="dropbear dbclient dropbearkey scp" \
MULTI=1 SCPPROGRESS=1
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
+ LD="$(TARGET_CC)" \
PROGRAMS="dropbearconvert"
endef
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index a28b8fd8ed..bf8124084c 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -161,7 +161,7 @@ endef
define Build/Compile
chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
@@ -171,7 +171,7 @@ endef
define Build/InstallDev
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
diff --git a/rules.mk b/rules.mk
index 89adb3efc2..2cd8ea9b25 100644
--- a/rules.mk
+++ b/rules.mk
@@ -54,8 +54,7 @@ SED:=$(STAGING_DIR)/bin/sed -i -e
CP:=cp -fpR
ifneq ($(CONFIG_CCACHE),)
- export CCACHE_DIR:=$(TOPDIR)/ccache_$(ARCH)
- TARGET_CC:=ccache $(TARGET_CC)
+ TARGET_CC:=CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH) ccache $(TARGET_CC)
endif
HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
diff --git a/toolchain/libnotimpl/Makefile b/toolchain/libnotimpl/Makefile
index bc515ca080..214f51c5dc 100644
--- a/toolchain/libnotimpl/Makefile
+++ b/toolchain/libnotimpl/Makefile
@@ -12,7 +12,7 @@ PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/libnotimpl
include $(INCLUDE_DIR)/host-build.mk
define cc
- $(TARGET_CC) $(TARGET_CFLAGS) -c src/$(1).c -o $(PKG_BUILD_DIR)/$(1).o
+ PATH="$(TARGET_PATH)" $(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)
- $(TARGET_CROSS)ar rc $(PKG_BUILD_DIR)/libnotimpl.a $(PKG_BUILD_DIR)/*.o
+ PATH="$(TARGET_PATH)" $(TARGET_CROSS)ar rc $(PKG_BUILD_DIR)/libnotimpl.a $(PKG_BUILD_DIR)/*.o
endef
define Build/Install
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index bb52ee300f..a99c734b92 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -55,7 +55,7 @@ endif
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
@@ -68,7 +68,7 @@ define Build/Configure
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
PREFIX= \
DEVEL_PREFIX=/ \
RUNTIME_PREFIX=/ \