Skip to content

Commit 5bbe3a5

Browse files
dschoGit for Windows Build Agent
authored andcommitted
mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
The tell-tale is the presence of the `MSYSTEM` value while compiling, of course. In that case, we want to ensure that `MSYSTEM` is set when running `git.exe`, and also enable the magic MSYS2 tty detection. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 40a8d0a commit 5bbe3a5

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

config.mak.uname

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,12 +753,12 @@ ifeq ($(uname_S),MINGW)
753753
prefix = $(MINGW_PREFIX)
754754
HOST_CPU = $(patsubst %-w64-mingw32,%,$(MINGW_CHOST))
755755
BASIC_LDFLAGS += -Wl,--pic-executable
756+
COMPAT_CFLAGS += -DDETECT_MSYS_TTY
756757
ifeq (MINGW32,$(MSYSTEM))
757758
BASIC_LDFLAGS += -Wl,--large-address-aware
758759
endif
759760
endif
760-
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
761-
-fstack-protector-strong
761+
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -fstack-protector-strong
762762
EXTLIBS += -lntdll
763763
EXTRA_PROGRAMS += headless-git$X
764764
INSTALL = /bin/install

0 commit comments

Comments
 (0)