Skip to content

Commit 440bc42

Browse files
committed
msvc: fix make MSVC=1 install
We used to install into $HOME/bin/, which wreaks havoc with installed versions of Git for Windows (because $HOME/bin is *prepended* to the PATH, hence would override `git.exe` in Git Bash). Let's align the MSVC case with the non-MSVC case and install into /mingw64/bin/ (or /mingw32/bin/ in 32-bit Git for Windows SDKs) instead. Noticed by Derrick Stolee. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 497e6c4 commit 440bc42

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

config.mak.uname

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,12 @@ endif
341341
ifeq ($(uname_S),Windows)
342342
GIT_VERSION := $(GIT_VERSION).MSVC
343343
pathsep = ;
344+
# Assume that this is built in Git for Windows' SDK
345+
ifeq (MINGW32,$(MSYSTEM))
346+
prefix = /mingw32
347+
else
348+
prefix = /mingw64
349+
endif
344350
# Prepend MSVC 64-bit tool-chain to PATH.
345351
#
346352
# A regular Git Bash *does not* have cl.exe in its $PATH. As there is a

0 commit comments

Comments
 (0)