[PATCH] Cygwin: Adjust path to newlib libm.a in builddir

Jon Turney jon.turney@dronecode.org.uk
Sat Feb 19 18:18:51 GMT 2022


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



More information about the Cygwin-patches mailing list