On Sun, 16 Mar 2025, Jacek Caban wrote:
---
mingw-w64-crt/Makefile.am | 14 +++++++++++---
mingw-w64-crt/crt/CRT_fp10.c | 8 --------
2 files changed, 11 insertions(+), 11 deletions(-)
First off, I think it may be good to explain what CRT_fp10.{c,o} is meant
for, in the commit message.
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 1e5a0d14b..15642b3ff 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -112,7 +112,7 @@ src_libdloadhelper=libsrc/dloadhelper.c misc/delay-f.c
src_libmingw32=include/oscalls.h include/internal.h include/sect_attribs.h \
crt/crtexewin.c crt/dll_argv.c crt/gccmain.c crt/natstart.c
crt/pseudo-reloc-list.c crt/wildcard.c \
crt/charmax.c crt/ucrtexewin.c crt/dllargv.c crt/_newmode.c
crt/tlssup.c crt/xncommod.c \
- crt/cinitexe.c crt/merr.c crt/pesect.c crt/udllargc.c
crt/xthdloc.c crt/CRT_fp10.c \
+ crt/cinitexe.c crt/merr.c crt/pesect.c crt/udllargc.c
crt/xthdloc.c \
crt/mingw_custom.c crt/mingw_helpers.c \
crt/pseudo-reloc.c crt/udll_argv.c \
crt/usermatherr.c \
@@ -1143,6 +1143,8 @@ else
crt32_DATA =
endif
+src_libmingw32 += crt/CRT_fp10.c
+
Won't this cause all expansions (or at least all following expansions) of
src_libmingw32 to include this?
COMPILE32=$(COMPILE) $(CPPFLAGS32) $(extra_include) -D_SYSCRT=1
lib32/crt1.o: crt/crtexe.c
$(COMPILE32) -c $< -o $@
@@ -1578,6 +1580,8 @@ else
crt64_DATA =
endif
+src_libmingw32 += crt/CRT_fp10.c
If there's nothing that resets src_libmingw32 inbetween, won't this keep
appending to src_libmingw32?
Admittedly, this is within an "if LIB32" and "if LIB64" - but at least
those two can be enabled at the same time.
Perhaps it'd be just simpler to add these on the individual command lines
that use $(src_libmingw32)?
This change is quite hard to grasp (without essentially manually redoing
the whole change), so some more comments about what's happening in the
makefile would be good.
// Martin
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
