From dfd972a534f0e12d3625747145b02fc1ef73948b Mon Sep 17 00:00:00 2001
From: "Alan C. Assis" <acassis@gmail.com>
Date: Fri, 14 Jan 2022 18:22:11 -0300
Subject: [PATCH] z80: Fix z80sim build system

---
 arch/z80/src/Makefile.sdccl | 3 +++
 tools/incdir.c              | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/arch/z80/src/Makefile.sdccl b/arch/z80/src/Makefile.sdccl
index 9b53baa1488..629e65fbca6 100644
--- a/arch/z80/src/Makefile.sdccl
+++ b/arch/z80/src/Makefile.sdccl
@@ -21,6 +21,9 @@
 # Tools
 # CFLAGS, CPPFLAGS, ASFLAGS, LDFLAGS are set in $(TOPDIR)/Make.defs
 
+ARCH_SRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
+
+CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)}
 CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip}
 CFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
 CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
diff --git a/tools/incdir.c b/tools/incdir.c
index d2564e6502a..8b108dd1e22 100644
--- a/tools/incdir.c
+++ b/tools/incdir.c
@@ -348,6 +348,10 @@ int main(int argc, char **argv, char **envp)
       wintool = true;
 #endif
     }
+  else if (compiler == COMPILER_SDCC)
+    {
+      cmdarg = "-I";
+    }
   else
     {
       cmdarg = (pathtype == SYSTEM_PATH) ? "-isystem" : "-I";