Skip to content

Commit d7155c7

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 115c4b7 commit d7155c7

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
@@ -747,12 +747,12 @@ ifeq ($(uname_S),MINGW)
747747
prefix = $(MINGW_PREFIX)
748748
HOST_CPU = $(patsubst %-w64-mingw32,%,$(MINGW_CHOST))
749749
BASIC_LDFLAGS += -Wl,--pic-executable
750+
COMPAT_CFLAGS += -DDETECT_MSYS_TTY
750751
ifeq (MINGW32,$(MSYSTEM))
751752
BASIC_LDFLAGS += -Wl,--large-address-aware
752753
endif
753754
endif
754-
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
755-
-fstack-protector-strong
755+
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -fstack-protector-strong
756756
EXTLIBS += -lntdll
757757
EXTRA_PROGRAMS += headless-git$X
758758
INSTALL = /bin/install

0 commit comments

Comments
 (0)