1.1 --- a/common/autoconf/toolchain.m4 Thu May 31 03:58:03 2018 -0400
1.2 +++ b/common/autoconf/toolchain.m4 Thu May 31 13:57:22 2018 +0100
1.3 @@ -334,8 +334,12 @@
1.4 # Restore path, etc
1.5 AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
1.6 [
1.7 - # Restore old path.
1.8 - PATH="$OLD_PATH"
1.9 + # Restore old path, except for the microsoft toolchain, which requires VS_PATH
1.10 + # to remain in place. Otherwise the compiler will not work in some situations
1.11 + # in later configure checks.
1.12 + if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then
1.13 + PATH="$OLD_PATH"
1.14 + fi
1.15
1.16 # Restore the flags to the user specified values.
1.17 # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
