mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
@@ -228,17 +228,6 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then
|
||||
check_prog_host "java"
|
||||
JAVA_GCJ=$(java -version 2>&1 | grep gcj)
|
||||
if [ ! -z "$JAVA_GCJ" ] ; then
|
||||
echo
|
||||
echo "$JAVA_GCJ is not sufficient to compile your package selection."
|
||||
echo "Please install an OpenJDK/IcedTea/Oracle Java."
|
||||
exit 1 ;
|
||||
fi
|
||||
fi
|
||||
|
||||
if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then
|
||||
if test ! -f /lib/ld-linux.so.2 ; then
|
||||
echo
|
||||
|
||||
Reference in New Issue
Block a user