scc

commit 54a70620b35380cf2ad6e225e6f8fdc522e6848a
parent 576fe84ed449291c5f3cb5b7a343cf92c00357ac
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Thu, 10 Oct 2024 08:17:13 +0200

Merge remote-tracking branch 'origin/master'

Diffstat:
M
Makefile
 | 
5
+++--
M
README
 | 
3
++-
M
include/bits/scc/Makefile
 | 
8
+++-----
M
scripts/build/host/bsd.mk
 | 
2
+-
M
src/libc/Makefile
 | 
2
+-

5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
@@ -13,12 +13,13 @@ include scripts/rules.mk
 ROOT = $(DESTDIR)$(PREFIX)
 NODEP = 1
 
-all: config
+all:
+	+@$(MAKE) `$(SCRIPTDIR)/config -c` config
 	+@$(MAKE) `$(SCRIPTDIR)/config -c` toolchain
 	+@$(MAKE) `$(SCRIPTDIR)/config` `uname -m`
 
 config:
-	cd include/bits/scc && $(MAKE) $@
+	+@cd include/bits/scc && $(MAKE)
 
 install: all
 	$(SCRIPTDIR)/install $(ROOT)
diff --git a/README b/README
@@ -91,7 +91,8 @@ The main targets of the Makefile are:
 	  by the user.
 
 	- distclean
-	  Remove all the generated files.
+	  Remove all the generated files, including the files generated by the
+	  config target that are not removed by the clean target.
 
 Toolchain configuration
 =======================
diff --git a/include/bits/scc/Makefile b/include/bits/scc/Makefile
@@ -5,19 +5,17 @@ PROJECTDIR = ../../..
 include $(PROJECTDIR)/scripts/rules.mk
 
 SYSHDR =\
-	sysld.h\
-	sysincludes.h\
+	config.h\
+	sys.h\
 	cstd.h\
 
 NODEP = 1
 
-all: cstd.h
+all: $(SYSHDR)
 
 cstd.h: cstd-$(STD).h
 	cp cstd-$(STD).h $@
 
-config: sys.h config.h
-
 config.h:
 	rm -f $@;\
 	trap "rm -f $$$$.h" EXIT INT QUIT HUP TERM;\
diff --git a/scripts/build/host/bsd.mk b/scripts/build/host/bsd.mk
@@ -1,4 +1,4 @@
 DRIVER = posix
 
-HOST_CPPFLAGS = -D_ISOC99_SOURCE -D_ANSI_SOURCE
+HOST_CPPFLAGS = -D_ISOC99_SOURCE
 HOSTCC = c99
diff --git a/src/libc/Makefile b/src/libc/Makefile
@@ -21,7 +21,7 @@ NODEP = 1
 TARGET = $(LIBC) $(BINDIR)/gcc-scc
 
 all: $(DIRS)
-	$(MAKE) $(TARGET)
+	+@$(MAKE) $(TARGET)
 
 $(LIBC): $(OBJS)
 	$(AR) $(PROJ_ARFLAGS) $(LIBC) $?