aboutsummaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-08-31 23:32:29 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-08-31 23:32:29 +0200
commit91141b141190b481422b7aea56e8f4d265c44e88 (patch)
tree9348d1efe1cd68f40e350b3b0b26d2ae102272dc /support
parent7b48cee91f9acdf46a27440ee2a44acf8fa63040 (diff)
parent90fb70b4c37ad3a3178b51c7941881aa8dfd8fa6 (diff)
downloadbuildroot-91141b141190b481422b7aea56e8f4d265c44e88.tar.gz
buildroot-91141b141190b481422b7aea56e8f4d265c44e88.tar.bz2
Merge branch 'next'
Diffstat (limited to 'support')
-rw-r--r--support/dependencies/dependencies.mk6
-rwxr-xr-xsupport/dependencies/dependencies.sh8
2 files changed, 6 insertions, 8 deletions
diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index a2d229c957..4a220e0e02 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -20,11 +20,17 @@ ifeq ($(BR2_STRIP_sstrip),y)
DEPENDENCIES_HOST_PREREQ+=host-sstrip
endif
+ifeq ($(BR2_CCACHE),y)
+DEPENDENCIES_HOST_PREREQ += host-ccache
+endif
+
core-dependencies:
@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
$(TOPDIR)/support/dependencies/dependencies.sh
+dependencies: HOSTCC=$(HOSTCC_NOCCACHE)
+dependencies: HOSTCXX=$(HOSTCXX_NOCCACHE)
dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)
dependencies-source:
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 61a4140abe..bce5cc6663 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -173,14 +173,6 @@ if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then
done
fi
-if grep -E '^BR2_TARGET_GENERIC_ROOT_PASSWD=".+"$' $BUILDROOT_CONFIG > /dev/null 2>&1; then
- if ! which mkpasswd > /dev/null 2>&1; then
- /bin/echo -e "\nYou need the 'mkpasswd' utility to set the root password\n"
- /bin/echo -e "(in Debian/ubuntu, 'mkpasswd' provided by the whois package)\n"
- exit 1
- fi
-fi
-
if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then
if test ! -f /lib/ld-linux.so.2 ; then
/bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture,"