scc

commit 53a5e58b9cdc57473f665ddf14546efcee978884
parent cd9485c063b23265dc54b9ebf331906cff98edc7
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Fri, 20 Jan 2023 14:41:45 +0100

Revert "build: Use config tool in libc and libcrt targets"

This reverts commit 083a917d528f85907c5e4a2994f723a91995ca99.

Diffstat:
M
Makefile
 | 
18
+++++++++---------
M
scripts/amd64.mk
 | 
12
++++++------
M
scripts/arm.mk
 | 
2
+-
M
scripts/arm64.mk
 | 
2
+-
M
scripts/i386.mk
 | 
2
+-
M
scripts/ppc.mk
 | 
2
+-

6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
@@ -13,7 +13,9 @@ include scripts/rules.mk
 ROOT = $(DESTDIR)$(PREFIX)
 NODEP = 1
 
-all: toolchain libc
+all: config
+	+@$(MAKE) `$(SCRIPTDIR)/config -c` toolchain
+	+@$(MAKE) `$(SCRIPTDIR)/config` `uname -m`
 
 config:
 	cd include/scc/scc && $(MAKE) $@
@@ -26,14 +28,12 @@ uninstall:
 	$(SCRIPTDIR)/uninstall $(ROOT)
 	+@$(MAKE) uninstall-`uname -m`
 
-toolchain: config dirs include/scc/scc
-	+@$(MAKE) `$(SCRIPTDIR)/config -c` src
-
-libc: config dirs
-	+@$(MAKE) `$(SCRIPTDIR)/config -c` `uname -m`
-
-libcrt: config dirs
-	+@$(MAKE) `$(SCRIPTDIR)/config -c` src/libcrt
+toolchain: src
+libc: src/libc
+libcrt: src/libcrt
+src: dirs include/scc/scc
+src/libc: dirs
+src/libcrt: dirs
 
 dirs: $(SCRIPTDIR)/libc-dirs
 	xargs mkdir -p < $(SCRIPTDIR)/libc-dirs
diff --git a/scripts/amd64.mk b/scripts/amd64.mk
@@ -1,10 +1,10 @@
 x86_64 amd64:
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-linux src/libc src/libcrt
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-openbsd src/libc src/libcrt
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-netbsd src/libc src/libcrt
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-dragonfly src/libc src/libcrt
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-darwin src/libc src/libcrt
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-freebsd src/libc src/libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-linux libc libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-openbsd libc libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-netbsd libc libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-dragonfly libc libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-darwin libc libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=amd64-freebsd libc libcrt
 
 install-x86_64 install-amd64: amd64
 	$(SCRIPTDIR)/install -p $(SCRIPTDIR)/proto.amd64 $(ROOT)
diff --git a/scripts/arm.mk b/scripts/arm.mk
@@ -1,5 +1,5 @@
 arm:
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=arm-linux src/libc src/libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=arm-linux libc libcrt
 
 install-arm: arm
 	$(SCRIPTDIR)/install -p $(SCRIPTDIR)/proto.arm $(ROOT)
diff --git a/scripts/arm64.mk b/scripts/arm64.mk
@@ -1,5 +1,5 @@
 arm64:
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=arm64-linux src/libc src/libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=arm64-linux libc libcrt
 
 install-arm64: arm64
 	$(SCRIPTDIR)/install -p $(SCRIPTDIR)/proto.arm64 $(ROOT)
diff --git a/scripts/i386.mk b/scripts/i386.mk
@@ -1,5 +1,5 @@
 i386:
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=i386-linux src/libc src/libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=i386-linux libc libcrt
 
 install-i386: i386
 	$(SCRIPTDIR)/install -p $(SCRIPTDIR)/proto.i386 $(ROOT)
diff --git a/scripts/ppc.mk b/scripts/ppc.mk
@@ -1,5 +1,5 @@
 ppc:
-	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=ppc-linux src/libc src/libcrt
+	+@$(MAKE) `$(SCRIPTDIR)/config` CONF=ppc-linux libc libcrt
 
 install-ppc: ppc
 	$(SCRIPTDIR)/install -p $(SCRIPTDIR)/proto.ppc $(ROOT)