From 6db8937adbd9ad8ded4257e1cae0d96b6440357a Mon Sep 17 00:00:00 2001 From: pierre Date: Fri, 15 Sep 2017 20:24:06 +0000 Subject: [PATCH] Also use in path ppudump for ppulogs rule git-svn-id: trunk@37219 - --- packages/Makefile | 11 ++++++----- packages/Makefile.fpc | 11 +++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index b74e4e4048..2443b4ce93 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017/08/22] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-08-22 rev 37024] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux @@ -1762,21 +1762,22 @@ else endif PPULIST:=$(wildcard */units/*/*.ppu) PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST)) -RMPPULOGLIST:=$(subst .ppu,.rm-log-ppu,$(PPULIST)) +RMPPULOGLIST:=$(subst .log-ppu,.rm-log-ppu,$(wildcard $(PPULOGLIST))) .PHONY : ppulogs cleanppulogs testppudump $(RMPPULOGLIST) ppulogs : $(PPULOGLIST) vpath %.ppu $(ALLPPUDIRS) vpath %.log-ppu $(ALLPPUDIRS) vpath %.rm-log-ppu $(ALLPPUDIRS) -%.log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) - ..$(PATHSEP)compiler$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@ -%.rm-log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) +%.log-ppu : %.ppu + ppudump -VA -M $< > $@ +%.rm-log-ppu : %.ppu -$(RMPROG) $< ../compiler/utils/ppudump$(EXEEXT): $(MAKE) -C $(COMPILERDIR)/utils ppudump$(EXEEXT) ppuinfo : echo PPU list is "$(PPULIST)" echo PPULOG list is "$(PPULOGLIST)" + echo RMPPULOG list is "$(RMPPULOGLIST)" cleanppulogs : $(RMPPULOGLIST) testppudump : $(MAKE) cleanppulogs ppulogs diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 2fd7cc3bc2..1a856db5cb 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -141,7 +141,8 @@ endif PPULIST:=$(wildcard */units/*/*.ppu) PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST)) -RMPPULOGLIST:=$(subst .ppu,.rm-log-ppu,$(PPULIST)) +# Only remove existing log-ppu files +RMPPULOGLIST:=$(subst .log-ppu,.rm-log-ppu,$(wildcard $(PPULOGLIST))) .PHONY : ppulogs cleanppulogs testppudump $(RMPPULOGLIST) @@ -151,10 +152,11 @@ vpath %.ppu $(ALLPPUDIRS) vpath %.log-ppu $(ALLPPUDIRS) vpath %.rm-log-ppu $(ALLPPUDIRS) -%.log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) - ..$(PATHSEP)compiler$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@ +# Do not try to recompile ppudump, as this does not work if trying to test cross-compiled units +%.log-ppu : %.ppu + ppudump -VA -M $< > $@ -%.rm-log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) +%.rm-log-ppu : %.ppu -$(RMPROG) $< @@ -164,6 +166,7 @@ vpath %.rm-log-ppu $(ALLPPUDIRS) ppuinfo : echo PPU list is "$(PPULIST)" echo PPULOG list is "$(PPULOGLIST)" + echo RMPPULOG list is "$(RMPPULOGLIST)" cleanppulogs : $(RMPPULOGLIST)