From 480da24d4df581022f48a9a3e3604501c7073af4 Mon Sep 17 00:00:00 2001 From: marco <marco@freepascal.org> Date: Thu, 31 Oct 2019 12:11:45 +0000 Subject: [PATCH] * makefile fixes by Alfred, mantis #36237 git-svn-id: trunk@43341 - --- rtl/solaris/Makefile | 6 ++++-- rtl/solaris/Makefile.fpc | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index 28deb68bbc..bfeee40062 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -3001,9 +3001,11 @@ character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT) macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) $(COMPILER) $(INC)/macpas.pp $(REDIR) ifneq ($(findstring $(ARCH),x86_64 i386),) -cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) +cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) objpas$(PPUEXT) + $(COMPILER) $(PROCINC)/cpu.pp else -cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) +cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) + $(COMPILER) $(PROCINC)/cpu.pp endif mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(PROCINC)/mmx.pp diff --git a/rtl/solaris/Makefile.fpc b/rtl/solaris/Makefile.fpc index 7b8cb915f9..d05460a088 100644 --- a/rtl/solaris/Makefile.fpc +++ b/rtl/solaris/Makefile.fpc @@ -221,9 +221,11 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) # ifneq ($(findstring $(ARCH),x86_64 i386),) -cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) +cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) objpas$(PPUEXT) + $(COMPILER) $(PROCINC)/cpu.pp else -cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) +cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) + $(COMPILER) $(PROCINC)/cpu.pp endif mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)