1.1 --- a/common/autoconf/toolchain.m4 Tue Jul 02 17:38:10 2013 -0700
1.2 +++ b/common/autoconf/toolchain.m4 Thu Jul 11 12:50:20 2013 -0700
1.3 @@ -47,7 +47,7 @@
1.4 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.5 # First line typically looks something like:
1.6 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
1.7 - COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
1.8 + COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.9 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
1.10 COMPILER_VENDOR="Microsoft CL.EXE"
1.11 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
1.12 @@ -226,15 +226,6 @@
1.13 ],
1.14 [])
1.15
1.16 -if test "x$SYS_ROOT" != "x/" ; then
1.17 - CFLAGS="--sysroot=$SYS_ROOT $CFLAGS"
1.18 - CXXFLAGS="--sysroot=$SYS_ROOT $CXXFLAGS"
1.19 - OBJCFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS"
1.20 - OBJCXXFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS"
1.21 - CPPFLAGS="--sysroot=$SYS_ROOT $CPPFLAGS"
1.22 - LDFLAGS="--sysroot=$SYS_ROOT $LDFLAGS"
1.23 -fi
1.24 -
1.25 # Store the CFLAGS etal passed to the configure script.
1.26 ORG_CFLAGS="$CFLAGS"
1.27 ORG_CXXFLAGS="$CXXFLAGS"
1.28 @@ -378,17 +369,20 @@
1.29 AS_IF([test "x$VARIANT" = xOPT], [
1.30 RC_FLAGS="$RC_FLAGS -d NDEBUG"
1.31 ])
1.32 - JDK_UPDATE_VERSION_NOTNULL=$JDK_UPDATE_VERSION
1.33 - AS_IF([test "x$JDK_UPDATE_VERSION" = x], [
1.34 - JDK_UPDATE_VERSION_NOTNULL=0
1.35 - ])
1.36 - RC_FLAGS="$RC_FLAGS -d \"JDK_BUILD_ID=$FULL_VERSION\""
1.37 - RC_FLAGS="$RC_FLAGS -d \"JDK_COMPANY=$COMPANY_NAME\""
1.38 - RC_FLAGS="$RC_FLAGS -d \"JDK_COMPONENT=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME binary\""
1.39 - RC_FLAGS="$RC_FLAGS -d \"JDK_VER=$JDK_MINOR_VERSION.$JDK_MICRO_VERSION.$JDK_UPDATE_VERSION_NOTNULL.$COOKED_BUILD_NUMBER\""
1.40 - RC_FLAGS="$RC_FLAGS -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\""
1.41 - RC_FLAGS="$RC_FLAGS -d \"JDK_NAME=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME $JDK_MINOR_VERSION $JDK_UPDATE_META_TAG\""
1.42 - RC_FLAGS="$RC_FLAGS -d \"JDK_FVER=$JDK_MINOR_VERSION,$JDK_MICRO_VERSION,$JDK_UPDATE_VERSION_NOTNULL,$COOKED_BUILD_NUMBER\""
1.43 +
1.44 + # The version variables used to create RC_FLAGS may be overridden
1.45 + # in a custom configure script, or possibly the command line.
1.46 + # Let those variables be expanded at make time in spec.gmk.
1.47 + # The \$ are escaped to the shell, and the $(...) variables
1.48 + # are evaluated by make.
1.49 + RC_FLAGS="$RC_FLAGS \
1.50 + -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
1.51 + -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
1.52 + -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
1.53 + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
1.54 + -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.55 + -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.56 + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
1.57
1.58 # lib.exe is used to create static libraries.
1.59 AC_CHECK_PROG([WINAR], [lib],[lib],,,)
