scc

commit 9d275a5c7bede08ee3ab2c2012ffeda5e011c137
parent cfd8977458f82d690f2d1af9e378b4f1b743514b
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Thu, 15 Feb 2024 07:30:21 +0100

as: Add libmach to the build

The next step in as is to generate actual binaries
and for that reason we are going to use libmach.

Diffstat:
M
src/cmd/as/Makefile
 | 
4
+++-
M
src/cmd/as/target/powerpc/powerpc.mk
 | 
2
+-
M
src/cmd/as/target/powerpc/powerpc64.mk
 | 
2
+-
M
src/cmd/as/target/x80/z80.mk
 | 
2
+-
M
src/cmd/as/target/x86/amd64.mk
 | 
2
+-
M
src/cmd/as/target/x86/i286.mk
 | 
2
+-
M
src/cmd/as/target/x86/i386.mk
 | 
2
+-

7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/cmd/as/Makefile b/src/cmd/as/Makefile
@@ -22,9 +22,11 @@ TARGET =\
 	$(LIBEXEC)/scc/as-powerpc64\
 	$(LIBEXEC)/scc/as-z80 \
 
+MORE_LDLIBS =  -lscc -lmach
+
 all: $(TARGET)
 
-$(TARGET): $(LIBSCC)
+$(TARGET): $(LIBSCC) $(LIBMACH)
 
 $(BINDIR)/scc-as: as
 	cp as $@
diff --git a/src/cmd/as/target/powerpc/powerpc.mk b/src/cmd/as/target/powerpc/powerpc.mk
@@ -9,4 +9,4 @@ $(POWERPC)/powerpctbl.c: $(POWERPC)/ops.dat $(POWERPC)/opers.dat lexh
 	./mktbl -f powerpc -c powerpc
 
 $(LIBEXEC)/scc/as-powerpc: $(POWERPC_OBJ)
-	$(CC) $(PROJ_LDFLAGS) $(POWERPC_OBJ) -lscc $(PROJ_LDLIBS) -o $@
+	$(CC) $(PROJ_LDFLAGS) $(POWERPC_OBJ) $(PROJ_LDLIBS) -o $@
diff --git a/src/cmd/as/target/powerpc/powerpc64.mk b/src/cmd/as/target/powerpc/powerpc64.mk
@@ -9,4 +9,4 @@ $(POWERPC)/powerpc64tbl.c: $(POWERPC)/ops.dat $(POWERPC)/opers.dat lexh
 	./mktbl -f powerpc -c powerpc64
 
 $(LIBEXEC)/scc/as-powerpc64: $(POWERPC64_OBJ)
-	$(CC) $(PROJ_LDFLAGS) $(POWERPC64_OBJ) -lscc $(PROJ_LDLIBS) -o $@
+	$(CC) $(PROJ_LDFLAGS) $(POWERPC64_OBJ) $(PROJ_LDLIBS) -o $@
diff --git a/src/cmd/as/target/x80/z80.mk b/src/cmd/as/target/x80/z80.mk
@@ -8,4 +8,4 @@ target/x80/z80tbl.c: target/x80/ops.dat target/x80/opers.dat lexh
 	./mktbl -f x80 -c z80
 
 $(LIBEXEC)/scc/as-z80: $(OBJ) $(Z80_OBJ)
-	$(CC) $(PROJ_LDFLAGS) $(Z80_OBJ) -lscc $(PROJ_LDLIBS) -o $@
+	$(CC) $(PROJ_LDFLAGS) $(Z80_OBJ) $(PROJ_LDLIBS) -o $@
diff --git a/src/cmd/as/target/x86/amd64.mk b/src/cmd/as/target/x86/amd64.mk
@@ -8,4 +8,4 @@ target/x86/amd64tbl.c: target/x86/ops.dat target/x86/opers.dat lexh
 	./mktbl -f x86 -c amd64
 
 $(LIBEXEC)/scc/as-amd64: $(AMD64_OBJ)
-	$(CC) $(PROJ_LDFLAGS) $(AMD64_OBJ) -lscc $(PROJ_LDLIBS) -o $@
+	$(CC) $(PROJ_LDFLAGS) $(AMD64_OBJ) $(PROJ_LDLIBS) -o $@
diff --git a/src/cmd/as/target/x86/i286.mk b/src/cmd/as/target/x86/i286.mk
@@ -8,4 +8,4 @@ target/x86/i286tbl.c: target/x86/ops.dat target/x86/opers.dat lexh
 	./mktbl -f x86 -c i286
 
 $(LIBEXEC)/scc/as-i286: $(I286_OBJ)
-	$(CC) $(PROJ_LDFLAGS) $(I286_OBJ) -lscc $(PROJ_LDLIBS)-o $@
+	$(CC) $(PROJ_LDFLAGS) $(I286_OBJ) $(PROJ_LDLIBS) -o $@
diff --git a/src/cmd/as/target/x86/i386.mk b/src/cmd/as/target/x86/i386.mk
@@ -8,4 +8,4 @@ target/x86/i386tbl.c: target/x86/ops.dat target/x86/opers.dat lexh
 	./mktbl -f x86 -c i386
 
 $(LIBEXEC)/scc/as-i386: $(I386_OBJ)
-	$(CC) $(PROJ_LDFLAGS) $(I386_OBJ) -lscc $(PROJ_LDLIBS) -o $@
+	$(CC) $(PROJ_LDFLAGS) $(I386_OBJ) $(PROJ_LDLIBS) -o $@