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

Add PPUDUMP variable to be able to specify explicit version of ppudump program, defaulting to ppudump executable in SEARCHPATH

Browse Source 
git-svn-id: trunk@42580 -
This commit is contained in:
pierre 2019-08-05 08:10:02 +00:00
parent d6c5a1799c
commit 754b1bd930
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/Makefile
View File

@ -496,6 +496,14 @@ endif
NOCPUDEF=1 NOCPUDEF=1
MSGFILE=msg/error$(FPCLANG).msg MSGFILE=msg/error$(FPCLANG).msg
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))) SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
PPUDUMPPROG:=$(firstword $(strip $(wildcard $(addsuffix /ppudump$(SRCEXEEXT),$(SEARCHPATH)))))
ifndef PPUDUMP
ifdef PPUDUMPPROG
PPUDUMP=$(PPUDUMPPROG)
else
PPUDUMP=ppudump
endif
endif
REVINC:=$(wildcard revision.inc) REVINC:=$(wildcard revision.inc)
ifneq ($(REVINC),) ifneq ($(REVINC),)
override LOCALOPT+=-dREVINC override LOCALOPT+=-dREVINC
@ -4568,7 +4576,6 @@ endif
endif endif
endif endif
else else
cycle: override FPC=
cycle: cycle:
ifdef NEED_G_COMPILERS ifdef NEED_G_COMPILERS
$(MAKE) fpcmade.generate_g_compilers $(MAKE) fpcmade.generate_g_compilers
@ -4693,7 +4700,7 @@ rtlppulogs : $(RTLPPULOGLIST)
vpath %.ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) vpath %.ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
%.log-ppu : %.ppu %.log-ppu : %.ppu
ppudump -VA -M $< > $@ $(PPUDUMP) -VA -M $< > $@
./utils/ppudump$(EXEEXT): ./utils/ppudump$(EXEEXT):
$(MAKE) -C $(COMPILERUTILSDIR) ppudump$(EXEEXT) $(MAKE) -C $(COMPILERUTILSDIR) ppudump$(EXEEXT)
ppuinfo : ppuinfo :

13
compiler/Makefile.fpc
View File

@ -235,6 +235,15 @@ MSGFILE=msg/error$(FPCLANG).msg
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))) SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
PPUDUMPPROG:=$(firstword $(strip $(wildcard $(addsuffix /ppudump$(SRCEXEEXT),$(SEARCHPATH)))))
ifndef PPUDUMP
ifdef PPUDUMPPROG
PPUDUMP=$(PPUDUMPPROG)
else
PPUDUMP=ppudump
endif
endif
# Check if revision.inc is present # Check if revision.inc is present
REVINC:=$(wildcard revision.inc) REVINC:=$(wildcard revision.inc)
ifneq ($(REVINC),) ifneq ($(REVINC),)
@ -919,7 +928,7 @@ else
# ppc3/ppcXXX = native (skipped for cross installation) # ppc3/ppcXXX = native (skipped for cross installation)
# #
cycle: override FPC= #cycle: override FPC=
cycle: cycle:
ifdef NEED_G_COMPILERS ifdef NEED_G_COMPILERS
$(MAKE) fpcmade.generate_g_compilers $(MAKE) fpcmade.generate_g_compilers
@ -1121,7 +1130,7 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
# Use installed ppudump # Use installed ppudump
%.log-ppu : %.ppu %.log-ppu : %.ppu
ppudump -VA -M $< > $@ $(PPUDUMP) -VA -M $< > $@
./utils/ppudump$(EXEEXT): ./utils/ppudump$(EXEEXT):