Thu, 31 May 2018 13:57:22 +0100
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
Reviewed-by: tbell, erikj
common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
common/autoconf/toolchain.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Thu May 31 03:58:03 2018 -0400 1.2 +++ b/common/autoconf/generated-configure.sh Thu May 31 13:57:22 2018 +0100 1.3 @@ -4305,7 +4305,7 @@ 1.4 #CUSTOM_AUTOCONF_INCLUDE 1.5 1.6 # Do not change or remove the following line, it is needed for consistency checks: 1.7 -DATE_WHEN_GENERATED=1527649790 1.8 +DATE_WHEN_GENERATED=1527770995 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -38321,8 +38321,12 @@ 1.13 fi 1.14 1.15 1.16 - # Restore old path. 1.17 - PATH="$OLD_PATH" 1.18 + # Restore old path, except for the microsoft toolchain, which requires VS_PATH 1.19 + # to remain in place. Otherwise the compiler will not work in some situations 1.20 + # in later configure checks. 1.21 + if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then 1.22 + PATH="$OLD_PATH" 1.23 + fi 1.24 1.25 # Restore the flags to the user specified values. 1.26 # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
2.1 --- a/common/autoconf/toolchain.m4 Thu May 31 03:58:03 2018 -0400 2.2 +++ b/common/autoconf/toolchain.m4 Thu May 31 13:57:22 2018 +0100 2.3 @@ -334,8 +334,12 @@ 2.4 # Restore path, etc 2.5 AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION], 2.6 [ 2.7 - # Restore old path. 2.8 - PATH="$OLD_PATH" 2.9 + # Restore old path, except for the microsoft toolchain, which requires VS_PATH 2.10 + # to remain in place. Otherwise the compiler will not work in some situations 2.11 + # in later configure checks. 2.12 + if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then 2.13 + PATH="$OLD_PATH" 2.14 + fi 2.15 2.16 # Restore the flags to the user specified values. 2.17 # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"