nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix escaping in msvc builds

Browse Source
This commit is contained in:
Diggory Blake 2015-08-27 18:16:31 +01:00
parent 28ef44a9e6
commit f86c853fee
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@ -1180,16 +1180,27 @@ do
# MSVC requires cmake because that's how we're going to build LLVM # MSVC requires cmake because that's how we're going to build LLVM
probe_need CFG_CMAKE cmake probe_need CFG_CMAKE cmake
# There are three builds of cmake on windows: MSVC, MinGW and Cygwin
# The Cygwin build does not have generators for Visual Studio, so
# detect that here and error.
if ! "$CFG_CMAKE" --help | sed -n '/^Generators/,$p' | grep 'Visual Studio' > /dev/null
then
err "cmake does not support Visual Studio generators.\n\n \
This is likely due to it being an msys/cygwin build of cmake, \
rather than the required windows version, built using MinGW \
or Visual Studio."
fi
# Use the REG program to figure out where VS is installed # Use the REG program to figure out where VS is installed
# We need to figure out where cl.exe and link.exe are, so we do some # We need to figure out where cl.exe and link.exe are, so we do some
# munging and some probing here. We also look for the default # munging and some probing here. We also look for the default
# 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=$(cmd //c reg QUERY \
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0' \ 'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0' \
-v InstallDir) -v InstallDir)
if [ -z "$install" ]; then if [ -z "$install" ]; then
install=$(reg QUERY \ install=$(cmd //c reg QUERY \
'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0' \ 'HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0' \
-v InstallDir) -v InstallDir)
fi fi
@ -1222,9 +1233,9 @@ do
eval CFG_MSVC_LINK_$bits="\"$bindir/link.exe\"" eval CFG_MSVC_LINK_$bits="\"$bindir/link.exe\""
vcvarsall="${CFG_MSVC_ROOT}/VC/vcvarsall.bat" vcvarsall="${CFG_MSVC_ROOT}/VC/vcvarsall.bat"
include_path=$(cmd /c "\"$vcvarsall\" $msvc_part && cmd /c echo %INCLUDE%") include_path=$(cmd //V:ON //c "$vcvarsall" $msvc_part \& echo !INCLUDE!)
need_ok "failed to learn about MSVC's INCLUDE" need_ok "failed to learn about MSVC's INCLUDE"
lib_path=$(cmd /c "\"$vcvarsall\" $msvc_part && cmd /c echo %LIB%") lib_path=$(cmd //V:ON //c "$vcvarsall" $msvc_part \& echo !LIB!)
need_ok "failed to learn about MSVC's LIB" need_ok "failed to learn about MSVC's LIB"
eval CFG_MSVC_INCLUDE_PATH_${bits}="\"$include_path\"" eval CFG_MSVC_INCLUDE_PATH_${bits}="\"$include_path\""