Skip to content

Commit e9b866e

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
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. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b043e26 commit e9b866e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

config.mak.uname

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

0 commit comments

Comments
 (0)