diff --git a/Makefile b/Makefile
index c980895f99..69d6012f73 100644
--- a/Makefile
+++ b/Makefile
@@ -3166,6 +3166,9 @@ ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc
 override FPCOPT+=-Cg
 endif
 endif
+ifneq ($(filter $(CPU_TARGET),z80),)
+override FPCOPT+=-CX -XX
+endif
 ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
@@ -3755,12 +3758,12 @@ help:
 	@exit
 registration:
 	$(MAKE) -C packager/registration
-lazutils: registration
+lazutils:
 	$(MAKE) -C components/lazutils
-lcl: lazutils
+lcl:
 	$(MAKE) -C components/freetype
 	$(MAKE) -C lcl
-basecomponents: lcl
+basecomponents:
 	$(MAKE) -C components/buildintf
 	$(MAKE) -C components/lazdebuggers/lazdebuggerintf
 	$(MAKE) -C components/debuggerintf
@@ -3779,9 +3782,9 @@ bigidecomponents:
 	$(MAKE) -C components bigide
 tools:
 	$(MAKE) -C tools
-revisioninc: lazutils
+revisioninc:
 	$(MAKE) -C ide revisioninc
-ide: basecomponents
+ide:
 	$(MAKE) -C ide ide
 idepkg: ide
 idebig:
diff --git a/Makefile.fpc b/Makefile.fpc
index 8ea8fe5903..d7f4b63967 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -121,14 +121,14 @@ registration:
 	$(MAKE) -C packager/registration
 
 #-----------------------------------------------------------------------------
-# build package lazutils (shared by all LCL_PLATFORMs) 
-lazutils: registration
+# build package lazutils (shared by all LCL_PLATFORMs)
+lazutils:
 	$(MAKE) -C components/lazutils
 
 #-----------------------------------------------------------------------------
 # build package FreeType, LCLBase and LCL for LCL_PLATFORM
 # requires lazutils
-lcl: lazutils
+lcl:
 	$(MAKE) -C components/freetype
 	$(MAKE) -C lcl
 
@@ -136,7 +136,7 @@ lcl: lazutils
 # build required LCL components needed by IDE for the LCL_PLATFORM
 # (Note: lazutils and codetools are shared on all LCL platforms)
 # requires lcl
-basecomponents: lcl
+basecomponents:
 	$(MAKE) -C components/buildintf
 	$(MAKE) -C components/lazdebuggers/lazdebuggerintf
 	$(MAKE) -C components/debuggerintf
@@ -167,13 +167,13 @@ tools:
 #-----------------------------------------------------------------------------
 # create/update ide/revision.inc
 # requires tools
-revisioninc: lazutils
+revisioninc:
 	$(MAKE) -C ide revisioninc
 
 #-----------------------------------------------------------------------------
 # build lazarus exe with minimum of packages for the LCL_PLATFORM
 # requires basecomponents and tools
-ide: basecomponents
+ide:
 	$(MAKE) -C ide ide
 
 #-----------------------------------------------------------------------------