Skip to content

Commit de79fea

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 <johannes.schindelin@gmx.de>
1 parent 5fc0167 commit de79fea

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

config.mak.uname

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -746,9 +746,8 @@ ifeq ($(uname_S),MINGW)
746746
ifeq (MINGW32,$(MSYSTEM))
747747
prefix = /mingw32
748748
HOST_CPU = i686
749-
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
750-
endif
751-
ifeq (MINGW64,$(MSYSTEM))
749+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup -Wl,--large-address-aware
750+
else ifeq (MINGW64,$(MSYSTEM))
752751
prefix = /mingw64
753752
HOST_CPU = x86_64
754753
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
@@ -757,7 +756,6 @@ ifeq ($(uname_S),MINGW)
757756
HOST_CPU = aarch64
758757
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
759758
else
760-
BASIC_LDFLAGS += -Wl,--large-address-aware
761759
endif
762760
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
763761
-fstack-protector-strong

0 commit comments

Comments
 (0)