scc

commit eafa054ecd27bc9e19f9d6424bc28a11345e57c6
parent c9781760aaadc50a2b2fcbb7f30ecc74d289d701
Author: Tim Kelly <gtkelly@dialectronics.com>
Date:   Thu, 26 Jan 2023 14:27:06 -0500

build: Separate CINCLUDES from CPPINCLUDES

Moves -I and -D to PROJ_CPPFLAGS, doesn't break anything that didn't
have it moved, some moves already done.

Diffstat:
M
scripts/build/host/bsd.mk
 | 
2
+-
M
scripts/build/host/posix.mk
 | 
2
+-
M
scripts/rules.mk
 | 
16
+++++++++++-----
M
src/cmd/cc/cc2/Makefile
 | 
2
+-
M
src/libc/rules.mk
 | 
6
+++---

5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/scripts/build/host/bsd.mk b/scripts/build/host/bsd.mk
@@ -1,3 +1,3 @@
 DRIVER = posix
 
-HOST_CFLAGS = -D_ISOC99_SOURCE -D_ANSI_SOURCE
+HOST_CPPFLAGS = -D_ISOC99_SOURCE -D_ANSI_SOURCE
diff --git a/scripts/build/host/posix.mk b/scripts/build/host/posix.mk
@@ -1,3 +1,3 @@
 DRIVER = posix
 
-HOST_CFLAGS = -D_POSIX_C_SOURCE=1
+HOST_CPPFLAGS = -D_POSIX_C_SOURCE=1
diff --git a/scripts/rules.mk b/scripts/rules.mk
@@ -22,6 +22,8 @@ BUILDDIR  = $(PROJECTDIR)/scripts/build
 CRTDIR    = $(PROJECTDIR)/lib/scc
 LIBCDIR   = $(CRTDIR)/$(ARCH)-$(SYS)
 MKDEP     = $(SCRIPTDIR)/mkdep
+SRCDIR    = $(PROJECTDIR)/src
+CMDDIR    = $(SRCDIR)/cmd
 
 # library dependences helpers
 LIBMACH = $(LIBDIR)/scc/libmach.a
@@ -33,7 +35,7 @@ include $(BUILDDIR)/tool/$(TOOL).mk
 include $(BUILDDIR)/host/$(HOST).mk
 
 # Locations for -I or -L in compiler, assembler or linker
-CINCLUDES = -I$(INCDIR)/scc
+CPPINCLUDES = -I$(INCDIR)/scc
 ASINCLUDES= -I$(INCDIR)/scc
 LDINCLUDES= -L$(LIBDIR)/scc
 
@@ -41,12 +43,16 @@ LDINCLUDES= -L$(LIBDIR)/scc
 STD = c99
 
 # Definition of command line for cc, as, ld and emu
+PROJ_CPPFLAGS =\
+	$(CPPINCLUDES)\
+	$(HOST_CPPFLAGS)\
+	$(MORE_CPPFLAGS)
+
 PROJ_CFLAGS =\
 	$(MORE_CFLAGS)\
 	$(HOST_CFLAGS)\
 	$(SYS_CFLAGS)\
 	$(TOOL_CFLAGS)\
-	$(CINCLUDES)\
 	$(CFLAGS)
 
 PROJ_LDFLAGS =\
@@ -123,13 +129,13 @@ $(DIRS): FORCE
 	$(AS) $(PROJ_ASFLAGS) $< -o $@
 
 .c.o:
-	$(CC) $(PROJ_CFLAGS) -o $@ -c $<
+	$(CC) $(PROJ_CPPFLAGS) $(PROJ_CFLAGS) -o $@ -c $<
 
 .c.s:
-	$(CC) $(PROJ_CFLAGS) -S -o $@ $<
+	$(CC) $(PROJ_CPPFLAGS) $(PROJ_CFLAGS) -S -o $@ $<
 
 .c.i:
-	$(CPP) $(PROJ_CFLAGS) -o $@ $<
+	$(CPP) $(PROJ_CPPFLAGS) -o $@ $<
 
 .elf.bin:
 	$(OC) -O binary $< $@
diff --git a/src/cmd/cc/cc2/Makefile b/src/cmd/cc/cc2/Makefile
@@ -3,7 +3,7 @@
 PROJECTDIR = ../../../..
 include $(PROJECTDIR)/scripts/rules.mk
 
-MORE_CFLAGS = -I$(INCDIR)/$(STD)
+MORE_CPPFLAGS = -I$(INCDIR)/$(STD) -I$(CMDDIR) -I.
 
 OBJS =\
 	main.o\
diff --git a/src/libc/rules.mk b/src/libc/rules.mk
@@ -1,4 +1,4 @@
-CINCLUDES =\
+CPPINCLUDES =\
 	-I$(INCDIR)\
 	-I$(INCDIR)/bits/$(SYS)\
 	-I$(INCDIR)/bits/$(ARCH)\
@@ -28,7 +28,7 @@ clean-libc: FORCE
 	rm -f *.6? *.7 *.8 *.z *.q
 
 .c.$O:
-	$(CC) $(PROJ_CFLAGS) -o $@ -c $<
+	$(CC) $(PROJ_CPPFLAGS) $(PROJ_CFLAGS) -o $@ -c $<
 
 .s.$O:
-	$(AS) $(PROJ_ASFLAGS) $< -o $@
+	$(AS) $(PROJ_CPPFLAGS) $(PROJ_ASFLAGS) $< -o $@