From 40d91f0afb6896bef7283debc0a16fad239c70d6 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 28 Jan 2021 13:30:16 +0700 Subject: [PATCH] make: Fix LDFLAGS ordering to fix cygwin build. (#313) Cygwin has a linker that requires the libs to come last. Closes Interlisp/medley#170. --- bin/makefile-tail | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/makefile-tail b/bin/makefile-tail index a3f2cd4..d1e71e3 100644 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -157,24 +157,24 @@ default : $(OSARCHDIR)lde $(OSARCHDIR)$(LDENAME) $(OSARCHDIR)ldeether \ $(OSARCHDIR)tstsout $(OSARCHDIR)setsout $(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o - $(CC) $(LDELDFLAGS) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o -o $(OSARCHDIR)lde + $(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde $(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o - $(CC) $(LDFLAGS) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o -o $(OSARCHDIR)$(LDENAME) + $(CC) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME) @ echo "" @ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'" $(OSARCHDIR)ldeether: $(OBJECTDIR)ldeether.o $(DLPIFILES) - $(CC) $(LDEETHERLDFLAGS) $(OBJECTDIR)ldeether.o $(DLPIFILES) -o $(OSARCHDIR)ldeether + $(CC) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether $(OSARCHDIR)mkvdate: $(OBJECTDIR)mkvdate.o $(REQUIRED-INCS) - $(CC) $(LDFLAGS) $(OBJECTDIR)mkvdate.o -o $(OSARCHDIR)mkvdate + $(CC) $(OBJECTDIR)mkvdate.o $(LDFLAGS) -o $(OSARCHDIR)mkvdate $(OSARCHDIR)tstsout: $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(REQUIRED-INCS) - $(CC) $(LDFLAGS) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) -lc -lm -o $(OSARCHDIR)tstsout + $(CC) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout $(OSARCHDIR)setsout: $(OBJECTDIR)setsout.o $(REQUIRED-INCS) - $(CC) $(LDFLAGS) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) -lc -lm -o $(OSARCHDIR)setsout + $(CC) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)setsout #### Component files ######################################################