From 89b3f6c86ab64ccd6c3e2d39db132ec1ea07926a Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 15 Sep 2017 11:24:06 +0000 Subject: [PATCH] Fix the RTL directory for old OSes that use OS_TARGET only for rtlppulogs rule git-svn-id: trunk@37210 - --- compiler/Makefile | 4 +++- compiler/Makefile.fpc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index fd3dae481c..73fcdff64c 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -4333,7 +4333,7 @@ PPUDIR=$(COMPILER_UNITTARGETDIR) ALLPPUDIR=$(CPU_TARGET)/units/* PPULIST=$(wildcard $(PPUDIR)/*.ppu) PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST)) -RTLPPUDIR=../rtl/units/$(FULL_TARGET) +RTLPPUDIR=../rtl/units/$(TARGETSUFFIX) RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu) RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST)) .PHONY : ppulogs cleanppulogs rtlppulogs cleanrtlppulogs testppudump @@ -4348,6 +4348,8 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) ppuinfo : echo PPU list is "$(PPULIST)" echo PPULOG list is "$(PPULOGLIST)" + echo RTLPPUDIR is "$(RTLPPUDIR)" + echo RTLPPU list is "$(RTLPPULIST)" cleanppulogs : -$(RMPROG) $(PPULOGLIST) cleanrtlppulogs : diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index f311e720f2..5aeaf482bb 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -912,7 +912,7 @@ ALLPPUDIR=$(CPU_TARGET)/units/* PPULIST=$(wildcard $(PPUDIR)/*.ppu) PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST)) -RTLPPUDIR=../rtl/units/$(FULL_TARGET) +RTLPPUDIR=../rtl/units/$(TARGETSUFFIX) RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu) RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST)) @@ -936,6 +936,8 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) ppuinfo : echo PPU list is "$(PPULIST)" echo PPULOG list is "$(PPULOGLIST)" + echo RTLPPUDIR is "$(RTLPPUDIR)" + echo RTLPPU list is "$(RTLPPULIST)" cleanppulogs : -$(RMPROG) $(PPULOGLIST)