bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

configure: Add support for VS 2015

Browse source 
Adds support to the configure script for detecting Visual Studio 2015 being
installed and builds LLVM/uses cl with that compiler. The compiler will
automatically use this MSVC linker anyway because it's the highest version.
This commit is contained in:
Alex Crichton 2015-07-23 19:38:00 -07:00
parent c85ba3e9cb
commit 95ec4be02b
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
configure vendored
View file

@ -1177,8 +1177,13 @@ do
# INCLUDE and LIB variables for MSVC so we can set those in the # INCLUDE and LIB variables for MSVC so we can set those in the
# build system as well. # build system as well.
install=$(reg QUERY \ install=$(reg QUERY \
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0' \ 'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0' \
-v InstallDir) -v InstallDir)
if [ -z "$install" ]; then
install=$(reg QUERY \
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0' \
-v InstallDir)
fi
need_ok "couldn't find visual studio install root" need_ok "couldn't find visual studio install root"
CFG_MSVC_ROOT=$(echo "$install" | grep InstallDir | sed 's/.*REG_SZ[ ]*//') CFG_MSVC_ROOT=$(echo "$install" | grep InstallDir | sed 's/.*REG_SZ[ ]*//')
CFG_MSVC_ROOT=$(dirname "$CFG_MSVC_ROOT") CFG_MSVC_ROOT=$(dirname "$CFG_MSVC_ROOT")
@ -1460,12 +1465,22 @@ do
msg "configuring LLVM with:" msg "configuring LLVM with:"
msg "$CMAKE_ARGS" msg "$CMAKE_ARGS"
case "$CFG_MSVC_ROOT" in
*14.0*)
generator="Visual Studio 14 2015"
;;
*12.0*)
generator="Visual Studio 12 2013"
;;
*)
err "can't determine generator for LLVM cmake"
;;
esac
case "$t" in case "$t" in
x86_64-*) x86_64-*)
generator="Visual Studio 12 2013 Win64" generator="$generator Win64"
;; ;;
i686-*) i686-*)
generator="Visual Studio 12 2013"
;; ;;
*) *)
err "can only build LLVM for x86 platforms" err "can only build LLVM for x86 platforms"