github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-01 14:16:47 +00:00
Code Issues Projects Releases Wiki Activity

1. Fixed makefile-tail so it uses $(LD) for linker operations instead of $(CC);

Browse Source 
$(LD) is set to $(CC) if $(LD) not set before makefile-tail.
2. In makefile-tail added $(UPFRONT_LDFLAGS) to accomdate emscripten build
   where -lidbfs.js needs to come before files in ld call.
3) replaced wasm builds with wasm_nl builds; removed wasm_nl builds.
This commit is contained in:
Frank Halasz
2024-02-13 12:48:44 -08:00
parent 461b6a901c
commit 610b7f42bb
4 changed files with 12 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/makefile-tail
View File

@@ -35,6 +35,7 @@
REQUIRED-INCS = $(INCDIR)version.h $(INCDIR)maiko/platform.h
LD ?= $(CC)
CFLAGS = $(OPTFLAGS) $(DFLAGS)
RFLAGS = -c $(CFLAGS) -I$(INCDIR) -I$(INCLUDEDIR)
@@ -145,21 +146,21 @@ EXTFILES = $(OBJECTDIR)usrsubr.o
################################################################################
$(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o
$(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde
$(LD) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde
$(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o
$(CC) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME)
@ echo "HELLO HELLO HELLO HELLO"
$(LD) $(UPFRONT_LDFLAGS) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME)
@ echo ""
@ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'"
$(OSARCHDIR)ldeether: $(OBJECTDIR)ldeether.o $(DLPIFILES)
$(CC) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether
$(LD) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether
$(OSARCHDIR)tstsout: $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(REQUIRED-INCS)
$(CC) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout
$(LD) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout
$(OSARCHDIR)setsout: $(OBJECTDIR)setsout.o $(REQUIRED-INCS)
$(CC) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)setsout
$(LD) $(OBJECTDIR)setsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)setsout
#### Component files ######################################################