paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 12:09:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the RTL directory for old OSes that use OS_TARGET only for rtlppulogs rule

Browse Source 
git-svn-id: trunk@37210 -
This commit is contained in:
pierre 2017-09-15 11:24:06 +00:00
parent e1dbb5edcb
commit 89b3f6c86a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/Makefile
View File

@ -4333,7 +4333,7 @@ PPUDIR=$(COMPILER_UNITTARGETDIR)
ALLPPUDIR=$(CPU_TARGET)/units/* ALLPPUDIR=$(CPU_TARGET)/units/*
PPULIST=$(wildcard $(PPUDIR)/*.ppu) PPULIST=$(wildcard $(PPUDIR)/*.ppu)
PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST)) PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
RTLPPUDIR=../rtl/units/$(FULL_TARGET) RTLPPUDIR=../rtl/units/$(TARGETSUFFIX)
RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu) RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST)) RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
.PHONY : ppulogs cleanppulogs rtlppulogs cleanrtlppulogs testppudump .PHONY : ppulogs cleanppulogs rtlppulogs cleanrtlppulogs testppudump
@ -4348,6 +4348,8 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
ppuinfo : ppuinfo :
echo PPU list is "$(PPULIST)" echo PPU list is "$(PPULIST)"
echo PPULOG list is "$(PPULOGLIST)" echo PPULOG list is "$(PPULOGLIST)"
echo RTLPPUDIR is "$(RTLPPUDIR)"
echo RTLPPU list is "$(RTLPPULIST)"
cleanppulogs : cleanppulogs :
-$(RMPROG) $(PPULOGLIST) -$(RMPROG) $(PPULOGLIST)
cleanrtlppulogs : cleanrtlppulogs :

4
compiler/Makefile.fpc
View File

@ -912,7 +912,7 @@ ALLPPUDIR=$(CPU_TARGET)/units/*
PPULIST=$(wildcard $(PPUDIR)/*.ppu) PPULIST=$(wildcard $(PPUDIR)/*.ppu)
PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST)) PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
RTLPPUDIR=../rtl/units/$(FULL_TARGET) RTLPPUDIR=../rtl/units/$(TARGETSUFFIX)
RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu) RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST)) RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
@ -936,6 +936,8 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
ppuinfo : ppuinfo :
echo PPU list is "$(PPULIST)" echo PPU list is "$(PPULIST)"
echo PPULOG list is "$(PPULOGLIST)" echo PPULOG list is "$(PPULOGLIST)"
echo RTLPPUDIR is "$(RTLPPUDIR)"
echo RTLPPU list is "$(RTLPPULIST)"
cleanppulogs : cleanppulogs :
-$(RMPROG) $(PPULOGLIST) -$(RMPROG) $(PPULOGLIST)