OpenJDK / jdk / hs
changeset 39928:8448cfeb0f1d
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
Reviewed-by: tbell
| author | erikj |
|---|---|
| date | Thu, 04 Aug 2016 10:03:57 +0200 |
| parents | d83934a74ff9 |
| children | f6828731baa8 |
| files | common/autoconf/generated-configure.sh common/autoconf/toolchain.m4 |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Aug 04 10:00:54 2016 +0200 +++ b/common/autoconf/generated-configure.sh Thu Aug 04 10:03:57 2016 +0200 @@ -5094,7 +5094,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1469202305 +DATE_WHEN_GENERATED=1470297769 ############################################################################### # @@ -43767,8 +43767,12 @@ fi - # Restore old path. - PATH="$OLD_PATH" + # Restore old path, except for the microsoft toolchain, which requires VS_PATH + # to remain in place. Otherwise the compiler will not work in some siutations + # in later configure checks. + if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then + PATH="$OLD_PATH" + fi # Restore the flags to the user specified values. # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
--- a/common/autoconf/toolchain.m4 Thu Aug 04 10:00:54 2016 +0200 +++ b/common/autoconf/toolchain.m4 Thu Aug 04 10:03:57 2016 +0200 @@ -312,8 +312,12 @@ # Restore path, etc AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION], [ - # Restore old path. - PATH="$OLD_PATH" + # Restore old path, except for the microsoft toolchain, which requires VS_PATH + # to remain in place. Otherwise the compiler will not work in some siutations + # in later configure checks. + if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then + PATH="$OLD_PATH" + fi # Restore the flags to the user specified values. # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"