summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
Diffstat (limited to 'support')
-rwxr-xr-xsupport/dependencies/dependencies.sh18
1 files changed, 8 insertions, 10 deletions
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 655b4c6346..255a07b08f 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -187,20 +187,18 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \
fi
fi
-if grep -q ^BR2_PACKAGE_CLASSPATH=y $BR2_CONFIG ; then
- for prog in javac jar; do
- if ! which $prog > /dev/null ; then
- echo >&2
- echo "You must install '$prog' on your build machine" >&2
- exit 1
- fi
- done
-fi
-
if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then
check_prog_host "java"
fi
+if grep -q ^BR2_NEEDS_HOST_JAVAC=y $BR2_CONFIG ; then
+ check_prog_host "javac"
+fi
+
+if grep -q ^BR2_NEEDS_HOST_JAR=y $BR2_CONFIG ; then
+ check_prog_host "jar"
+fi
+
if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then
if test ! -f /lib/ld-linux.so.2 ; then
echo
OpenPOWER on IntegriCloud