diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-03-09 14:59:05 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-03-09 15:31:03 +0100 |
| commit | 524e36f8071530c4706304a305402944a4a32dfa (patch) | |
| tree | e3bf5e6ae9831aab51449707769f46e4e2b2bc15 /configure.ac | |
| parent | fee2de9cb1f4763a0e4f7e0e3bae6858c3d458b4 (diff) | |
configure: find MSVC 2017 64-bit compiler
Change-Id: I7ae99ebc693291709edc6df233f54dfe00d74e9e
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c232649b7169..d1b813fbafe5 100644 --- a/configure.ac +++ b/configure.ac @@ -3681,7 +3681,6 @@ if test "$_os" = "WINNT"; then LINK_X64_BINARY= 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]) if test -f "$VC_PRODUCT_DIR/atlmfc/lib/amd64/atls.lib"; then # Prefer native x64 compiler to cross-compiler, in case we are running @@ -3695,6 +3694,13 @@ if test "$_os" = "WINNT"; then CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe" 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 if test "$BUILD_X64" = TRUE; then AC_MSG_RESULT([found]) |