common/autoconf/generated-configure.sh
Print this page
*** 3866,3876 ****
# definitions. It is replaced with custom functionality when building
# custom sources.
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1383701615
###############################################################################
#
# Initialization / Boot-strapping
#
--- 3866,3876 ----
# definitions. It is replaced with custom functionality when building
# custom sources.
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1384766704
###############################################################################
#
# Initialization / Boot-strapping
#
*** 15917,15936 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5
$as_echo "$as_me: This might be fixed by explicitely setting --with-boot-jdk" >&6;}
as_fn_error $? "Cannot continue" "$LINENO" 5
fi
! # Setup proper paths for what we found
! BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
! if test ! -f "$BOOT_RTJAR"; then
! # On MacOSX it is called classes.jar
! BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
! if test -f "$BOOT_RTJAR"; then
! # Remove the ..
! BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
! fi
fi
BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
BOOT_JDK="$BOOT_JDK"
--- 15917,15950 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5
$as_echo "$as_me: This might be fixed by explicitely setting --with-boot-jdk" >&6;}
as_fn_error $? "Cannot continue" "$LINENO" 5
fi
! # Get the value of BOOT_RTJAR by parsing the 'sun.boot.class.path' property.
! # We only use the existing jar-files and directories of 'sun.boot.class.path'.
! #
! # The tricky thing is that we must quote AWK field references (i.e. , , ..)
! # and the name 'index' which is a M4-buildin function by placing brackets
! # (i.e. '[]') into the corresponding names.
! BOOT_RTJAR=`$BOOT_JDK/bin/java -XshowSettings:properties 2>&1 | $NAWK ' \
! /path.separator/ { path_separator = $3 } \
! /sun.boot.class.path/ { if (system("test -e \"" $3 "\"") == 0) sun_boot_class_path = $3; \
! while (getline && !index($0,"=")) { \
! if (system("test -e \"" $1 "\"") == 0) sun_boot_class_path = sun_boot_class_path "\n" $1 \
! } \
! sub("^\n", "", sun_boot_class_path) \
! } \
! END { gsub("\n", path_separator, sun_boot_class_path); print sun_boot_class_path }'`
!
! # The content of sun.boot.class.path is in Windows form on Windows.
! # We have to convert it to Unix form first, but with Windows path
! # separators. This is required by the FIXPATH utility which will convert
! # it back to the Windows form later on during the build process.
! if test "x$OPENJDK_TARGET_OS" = xwindows; then
! BOOT_RTJAR=`cygpath -u -p "$BOOT_RTJAR" | $TR ':' ';'`
fi
+
BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
BOOT_JDK="$BOOT_JDK"