Skip to content

Commit fa008ae

Browse files
dschoGit for Windows Build Agent
authored andcommitted
mingw: only use -Wl,--large-address-aware for 32-bit builds
That option only matters there, and is in fact only really understood in those builds; UCRT64 versions of GCC, for example, do not know what to do with that option. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 719f5b8 commit fa008ae

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

config.mak.uname

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -750,9 +750,8 @@ ifeq ($(uname_S),MINGW)
750750
ifeq (MINGW32,$(MSYSTEM))
751751
prefix = /mingw32
752752
HOST_CPU = i686
753-
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
754-
endif
755-
ifeq (MINGW64,$(MSYSTEM))
753+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup -Wl,--large-address-aware
754+
else ifeq (MINGW64,$(MSYSTEM))
756755
prefix = /mingw64
757756
HOST_CPU = x86_64
758757
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
@@ -761,7 +760,6 @@ ifeq ($(uname_S),MINGW)
761760
HOST_CPU = aarch64
762761
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
763762
else
764-
BASIC_LDFLAGS += -Wl,--large-address-aware
765763
endif
766764
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
767765
-DENSURE_MSYSTEM_IS_SET -fstack-protector-strong

0 commit comments

Comments
 (0)