* [PATCH] Cygwin: Adjust path to newlib libm.a in builddir
@ 2022-02-19 18:18 Jon Turney
2022-02-19 18:24 ` Jon Turney
0 siblings, 1 reply; 2+ messages in thread
From: Jon Turney @ 2022-02-19 18:18 UTC (permalink / raw)
To: cygwin-patches; +Cc: Jon Turney
Adjust path to newlib libm.a in builddir, changed by ac9f8c46
---
winsup/cygwin/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index ad38fb220..1c4f00c24 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -626,7 +626,7 @@ $(LDSCRIPT): $(LDSCRIPT).in
# cygwin dll
$(PRE_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
- $(newlib_build)/libm/libm.a $(newlib_build)/libc/libc.a
+ $(newlib_build)/libm.a $(newlib_build)/libc/libc.a
$(AM_V_CXXLD)$(CXX) $(CXXFLAGS) \
-mno-use-libstdc-wrappers \
-Wl,--gc-sections -nostdlib -Wl,-T$(LDSCRIPT) -static \
@@ -635,7 +635,7 @@ $(PRE_DLL_NAME): $(LDSCRIPT) libdll.a $(VERSION_OFILES) $(LIBSERVER)\
-Wl,-whole-archive libdll.a -Wl,-no-whole-archive \
$(VERSION_OFILES) \
$(LIBSERVER) \
- $(newlib_build)/libm/libm.a \
+ $(newlib_build)/libm.a \
$(newlib_build)/libc/libc.a \
-lgcc -lkernel32 -lntdll -Wl,-Map,cygwin.map
@@ -696,7 +696,7 @@ speclib=\
libc.a: $(LIB_NAME) libm.a libpthread.a libutil.a
$(AM_V_GEN)$(speclib) $^ -v $(@F)
-libm.a: $(LIB_NAME) $(newlib_build)/libm/libm.a $(addsuffix .o,$(basename $(MATH_FILES)))
+libm.a: $(LIB_NAME) $(newlib_build)/libm.a $(addsuffix .o,$(basename $(MATH_FILES)))
$(AM_V_GEN)$(speclib) $^ $(@F)
libpthread.a: $(LIB_NAME) pthread.o thread.o libc/call_once.o libc/cnd.o \
--
2.35.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Cygwin: Adjust path to newlib libm.a in builddir
2022-02-19 18:18 [PATCH] Cygwin: Adjust path to newlib libm.a in builddir Jon Turney
@ 2022-02-19 18:24 ` Jon Turney
0 siblings, 0 replies; 2+ messages in thread
From: Jon Turney @ 2022-02-19 18:24 UTC (permalink / raw)
To: Cygwin Patches
On 19/02/2022 18:18, Jon Turney wrote:
> Adjust path to newlib libm.a in builddir, changed by ac9f8c46
This is the obvious part of the fix. After this, linking still fails
with some duplicate symbols, but I think they are both in newlib's libm,
so the mistake is there...
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-19 18:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-19 18:18 [PATCH] Cygwin: Adjust path to newlib libm.a in builddir Jon Turney
2022-02-19 18:24 ` Jon Turney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).