OpenJDK / amber / amber
changeset 58298:5a4b4544b810
8232167: Visual Studio install found through --with-tools-dir value is discarded
Reviewed-by: erikj, ihse
| author | jvernee |
|---|---|
| date | Fri, 11 Oct 2019 06:57:33 -0700 |
| parents | 06bd38a9bc5a |
| children | 3968bf3673c5 |
| files | make/autoconf/toolchain_windows.m4 |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/autoconf/toolchain_windows.m4 Fri Oct 11 06:31:52 2019 -0700 +++ b/make/autoconf/toolchain_windows.m4 Fri Oct 11 06:57:33 2019 -0700 @@ -209,6 +209,8 @@ eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}" eval VS_ENV_ARGS="\${VS_ENV_ARGS_${VS_VERSION}}" eval VS_TOOLSET_SUPPORTED="\${VS_TOOLSET_SUPPORTED_${VS_VERSION}}" + + VS_ENV_CMD="" # When using --with-tools-dir, assume it points to the correct and default # version of Visual Studio or that --with-toolchain-version was also set. @@ -227,8 +229,6 @@ fi fi - VS_ENV_CMD="" - if test "x$VS_COMNTOOLS" != x; then TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], [$VS_COMNTOOLS/../..], [$VS_COMNTOOLS_VAR variable])