common/autoconf/generated-configure.sh

changeset 838
ec48d637778a
parent 813
9b102ab97693
child 839
174a54ce39c4
equal deleted inserted replaced
814:d086227bfc45 838:ec48d637778a
3816 # definitions. It is replaced with custom functionality when building 3816 # definitions. It is replaced with custom functionality when building
3817 # custom sources. 3817 # custom sources.
3818 #CUSTOM_AUTOCONF_INCLUDE 3818 #CUSTOM_AUTOCONF_INCLUDE
3819 3819
3820 # Do not change or remove the following line, it is needed for consistency checks: 3820 # Do not change or remove the following line, it is needed for consistency checks:
3821 DATE_WHEN_GENERATED=1381162713 3821 DATE_WHEN_GENERATED=1381335331
3822 3822
3823 ############################################################################### 3823 ###############################################################################
3824 # 3824 #
3825 # Initialization / Boot-strapping 3825 # Initialization / Boot-strapping
3826 # 3826 #
19684 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"` 19684 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
19685 COMPILER_VENDOR="Sun Studio" 19685 COMPILER_VENDOR="Sun Studio"
19686 fi 19686 fi
19687 elif test "x$OPENJDK_TARGET_OS" = xwindows; then 19687 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
19688 # First line typically looks something like: 19688 # First line typically looks something like:
19689 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 19689 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
19690 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` 19690 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
19691 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` 19691 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
19692 COMPILER_VENDOR="Microsoft CL.EXE" 19692 COMPILER_VENDOR="Microsoft CL.EXE"
19693 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"` 19693 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
19694 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then 19694 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
21256 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"` 21256 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*[ ,\t]$COMPILER_NAME[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p"`
21257 COMPILER_VENDOR="Sun Studio" 21257 COMPILER_VENDOR="Sun Studio"
21258 fi 21258 fi
21259 elif test "x$OPENJDK_TARGET_OS" = xwindows; then 21259 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
21260 # First line typically looks something like: 21260 # First line typically looks something like:
21261 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 21261 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
21262 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` 21262 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
21263 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` 21263 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
21264 COMPILER_VENDOR="Microsoft CL.EXE" 21264 COMPILER_VENDOR="Microsoft CL.EXE"
21265 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"` 21265 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
21266 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then 21266 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then

mercurial