common/autoconf/generated-configure.sh

changeset 752
0871b5799149
parent 750
f5eb23490e6a
child 754
78aaf5d3314d
equal deleted inserted replaced
751:e5cf1735638c 752:0871b5799149
3783 # definitions. It is replaced with custom functionality when building 3783 # definitions. It is replaced with custom functionality when building
3784 # custom sources. 3784 # custom sources.
3785 #CUSTOM_AUTOCONF_INCLUDE 3785 #CUSTOM_AUTOCONF_INCLUDE
3786 3786
3787 # Do not change or remove the following line, it is needed for consistency checks: 3787 # Do not change or remove the following line, it is needed for consistency checks:
3788 DATE_WHEN_GENERATED=1372317997 3788 DATE_WHEN_GENERATED=1372413413
3789 3789
3790 ############################################################################### 3790 ###############################################################################
3791 # 3791 #
3792 # Initialization / Boot-strapping 3792 # Initialization / Boot-strapping
3793 # 3793 #
20131 COMPILER_VENDOR="Sun Studio" 20131 COMPILER_VENDOR="Sun Studio"
20132 fi 20132 fi
20133 elif test "x$OPENJDK_TARGET_OS" = xwindows; then 20133 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
20134 # First line typically looks something like: 20134 # First line typically looks something like:
20135 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 20135 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
20136 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1` 20136 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
20137 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` 20137 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
20138 COMPILER_VENDOR="Microsoft CL.EXE" 20138 COMPILER_VENDOR="Microsoft CL.EXE"
20139 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"` 20139 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
20140 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then 20140 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
20141 if test "x$COMPILER_CPU_TEST" != "x80x86"; then 20141 if test "x$COMPILER_CPU_TEST" != "x80x86"; then
21704 COMPILER_VENDOR="Sun Studio" 21704 COMPILER_VENDOR="Sun Studio"
21705 fi 21705 fi
21706 elif test "x$OPENJDK_TARGET_OS" = xwindows; then 21706 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
21707 # First line typically looks something like: 21707 # First line typically looks something like:
21708 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 21708 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
21709 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1` 21709 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
21710 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` 21710 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
21711 COMPILER_VENDOR="Microsoft CL.EXE" 21711 COMPILER_VENDOR="Microsoft CL.EXE"
21712 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"` 21712 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
21713 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then 21713 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
21714 if test "x$COMPILER_CPU_TEST" != "x80x86"; then 21714 if test "x$COMPILER_CPU_TEST" != "x80x86"; then

mercurial