Skip to content

Commit 6ac2e9e

Browse files
authored
Re-enable MINGW32-specific compile options (#5470)
This reverts a mistake of mine: My change to introduce an "else ifeq" in #5439 chain missed that there is [an `else` clause](https://github.com/dscho/git/blob/31963038164d1a2d78dc46225f8441e8c0fb07a8/config.mak.uname#L739-L742) that should be used for MINGW32 and MSys (to add large-address-awareness and use 32-bit `time_t`) but not for CLANGARM64 nor for MINGW64.
2 parents 511a07b + 1d8de19 commit 6ac2e9e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

config.mak.uname

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,8 @@ ifeq ($(uname_S),MINGW)
728728
prefix = /mingw32
729729
HOST_CPU = i686
730730
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
731-
else ifeq (MINGW64,$(MSYSTEM))
731+
endif
732+
ifeq (MINGW64,$(MSYSTEM))
732733
prefix = /mingw64
733734
HOST_CPU = x86_64
734735
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup

0 commit comments

Comments
 (0)