Kaydet (Commit) 524e36f8 authored tarafından Michael Stahl's avatar Michael Stahl

configure: find MSVC 2017 64-bit compiler

Change-Id: I7ae99ebc693291709edc6df233f54dfe00d74e9e
üst fee2de9c
...@@ -3681,7 +3681,6 @@ if test "$_os" = "WINNT"; then ...@@ -3681,7 +3681,6 @@ if test "$_os" = "WINNT"; then
LINK_X64_BINARY= LINK_X64_BINARY=
if test "$BITNESS_OVERRIDE" = ""; then if test "$BITNESS_OVERRIDE" = ""; then
# TODO(davido): This is probably broken for MSVC 15.0
AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions]) AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions])
if test -f "$VC_PRODUCT_DIR/atlmfc/lib/amd64/atls.lib"; then if test -f "$VC_PRODUCT_DIR/atlmfc/lib/amd64/atls.lib"; then
# Prefer native x64 compiler to cross-compiler, in case we are running # Prefer native x64 compiler to cross-compiler, in case we are running
...@@ -3695,6 +3694,13 @@ if test "$_os" = "WINNT"; then ...@@ -3695,6 +3694,13 @@ if test "$_os" = "WINNT"; then
CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe"
LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe" LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe"
fi fi
elif test -f "$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/atlmfc/lib/x64/atls.lib"; then
# nobody uses 32-bit OS to build, just pick the 64-bit compiler
if "$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe" -? </dev/null >/dev/null 2>&1; then
BUILD_X64=TRUE
CXX_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe"
LINK_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/link.exe"
fi
fi fi
if test "$BUILD_X64" = TRUE; then if test "$BUILD_X64" = TRUE; then
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment