Skip to content
Permalink
Browse files

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 <johannes.schindelin@gmx.de>
  • Loading branch information...
dscho committed Oct 31, 2017
1 parent ed3d106 commit c9e62ccb591963b8387eda3f5d34aea015202ea8
Showing with 6 additions and 0 deletions.
  1. +6 −0 config.mak.uname
@@ -342,6 +342,12 @@ endif
ifeq ($(uname_S),Windows)
GIT_VERSION := $(GIT_VERSION).MSVC
pathsep = ;
# Assume that this is built in Git for Windows' SDK
ifeq (MINGW32,$(MSYSTEM))
prefix = /mingw32
else
prefix = /mingw64
endif
# Prepend MSVC 64-bit tool-chain to PATH.
#
# A regular Git Bash *does not* have cl.exe in its $PATH. As there is a

1 comment on commit c9e62cc

@derrickstolee

This comment has been minimized.

Copy link

commented on c9e62cc Oct 31, 2017

Looks good to me, @dscho! Thanks.

Please sign in to comment.
You can’t perform that action at this time.