common/autoconf/generated-configure.sh

changeset 2227
77b81e582939
parent 2226
d5dd14b37ea5
child 2228
1a5c98aae346
     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"

mercurial