* allow disabling the wpo cycle with NOWPOCYCLE=1

git-svn-id: trunk@13572 -
This commit is contained in:
Jonas Maebe 2009-08-21 14:27:37 +00:00
parent d3d3596cd6
commit 2eebadf944
2 changed files with 12 additions and 7 deletions

View File

@ -3342,7 +3342,9 @@ endif
$(MOVE) $(COMPILER_TARGETDIR)/$(PPEXENAME) $(EXENAME)
ifeq ($(CPU_SOURCE),$(PPC_TARGET))
ifeq ($(OS_SOURCE),$(OS_TARGET))
ifndef NOWPOCYCLE
ifdef RELEASE
DOWPOCYCLE=1
wpocycle:
$(RM) $(EXENAME)
$(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler
@ -3353,8 +3355,9 @@ wpocycle:
$(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
$(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
$(COPY) $(EXENAME) $(TEMPWPONAME2)
$(MAKE) echotime
else
endif
endif
ifndef DOWPOCYCLE
wpocycle:
endif
ifdef DIFF

View File

@ -409,7 +409,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
# Normal cycle
#
ifndef NOWPOCYCLE
ifdef RELEASE
DOWPOCYCLE=1
# Two WPO cycles in case of RELEASE=1
wpocycle:
# don't use cycle_clean, it will delete the compiler utilities again
@ -422,12 +424,12 @@ wpocycle:
$(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl
$(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler
$(COPY) $(EXENAME) $(TEMPWPONAME2)
$(MAKE) echotime
else
wpocycle:
endif
endif
ifndef DOWPOCYCLE
wpocycle:
endif
# Used to avoid unnecessary steps
ifdef DIFF