Browse Source

* don't clean rtl unit dir in ppuclean, this breaks the snapshot
building

peter 22 years ago
parent
commit
12cced8116
2 changed files with 8 additions and 4 deletions
  1. 3 2
      compiler/Makefile
  2. 5 2
      compiler/Makefile.fpc

+ 3 - 2
compiler/Makefile

@@ -235,6 +235,7 @@ endif
 export PPC_OS
 CPU_UNITDIR=.
 UTILSDIR=../utils
+COMPILERSOURCEDIR=$(PPC_TARGET) systems
 COMPILERUTILSDIR=utils
 ifndef FPCLANG
 FPCLANG=e
@@ -319,7 +320,7 @@ override FPCOPT:=$(LOCALOPT)
 override TARGET_DIRS+=utils
 override INSTALL_FPCPACKAGE=y
 override COMPILER_INCLUDEDIR+=$(PPC_TARGET)
-override COMPILER_UNITDIR+=$(PPC_TARGET) systems
+override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 override COMPILER_TARGETDIR+=$(CPU_UNITDIR)
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -1607,7 +1608,7 @@ echotime:
 	@echo Start $(STARTTIME) now $(ENDTIME)
 ppuclean:
 	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
-	-$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILER_UNITDIR))
+	-$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
 execlean :
 	-$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
 $(addsuffix _clean,$(CYCLETARGETS)):

+ 5 - 2
compiler/Makefile.fpc

@@ -11,7 +11,7 @@ dirs=utils
 
 [compiler]
 targetdir=$(CPU_UNITDIR)
-unitdir=$(PPC_TARGET) systems
+unitdir=$(COMPILERSOURCEDIR)
 includedir=$(PPC_TARGET)
 
 [require]
@@ -72,6 +72,9 @@ CPU_UNITDIR=.
 # RTL
 UTILSDIR=../utils
 
+# Directories containing compiler sources
+COMPILERSOURCEDIR=$(PPC_TARGET) systems
+
 # Utils used by compiler development/installation
 COMPILERUTILSDIR=utils
 
@@ -290,7 +293,7 @@ echotime:
 
 ppuclean:
         -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
-        -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILER_UNITDIR))
+        -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR))
 
 execlean :
         -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)