Skip to content

Commit 8442555

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 <[email protected]>
1 parent cfa4e50 commit 8442555

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

config.mak.uname

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -751,12 +751,12 @@ ifeq ($(uname_S),MINGW)
751751
prefix = $(MINGW_PREFIX)
752752
HOST_CPU = $(patsubst %-w64-mingw32,%,$(MINGW_CHOST))
753753
BASIC_LDFLAGS += -Wl,--pic-executable
754+
COMPAT_CFLAGS += -DDETECT_MSYS_TTY -DENSURE_MSYSTEM_IS_SET
754755
ifeq (MINGW32,$(MSYSTEM))
755756
BASIC_LDFLAGS += -Wl,--large-address-aware
756757
endif
757758
endif
758-
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
759-
-DENSURE_MSYSTEM_IS_SET -fstack-protector-strong
759+
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -fstack-protector-strong
760760
EXTLIBS += -lntdll
761761
EXTRA_PROGRAMS += headless-git$X
762762
INSTALL = /bin/install

0 commit comments

Comments
 (0)