paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-07 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert Makefile changes unrelated to last commit about powerpc-aix cycle fix

Browse Source 
git-svn-id: trunk@35276 -
This commit is contained in:
pierre 2017-01-10 23:36:32 +00:00
parent 1342d0792f
commit dda85c3c49
2 changed files with 0 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/Makefile
View File

@ -3995,11 +3995,7 @@ endif
ifndef EXENAME ifndef EXENAME
EXENAME=ppc$(CPUSUF)$(EXEEXT) EXENAME=ppc$(CPUSUF)$(EXEEXT)
endif endif
ifndef MULTIEXENAME
MULTIEXENAME=multippc$(CPUSUF)$(EXEEXT)
endif
PPEXENAME=pp$(EXEEXT) PPEXENAME=pp$(EXEEXT)
PPMULTIEXENAME=multipp$(EXEEXT)
TEMPNAME=ppc$(SRCEXEEXT) TEMPNAME=ppc$(SRCEXEEXT)
ifneq ($(CPUSUF),jvm) ifneq ($(CPUSUF),jvm)
PPCROSSNAME=ppcross$(CPUSUF)$(SRCEXEEXT) PPCROSSNAME=ppcross$(CPUSUF)$(SRCEXEEXT)
@ -4033,7 +4029,6 @@ alltargets: $(ALLTARGETS)
.PHONY: all compiler echotime ppuclean execlean clean distclean .PHONY: all compiler echotime ppuclean execlean clean distclean
all: compiler $(addsuffix _all,$(TARGET_DIRS)) all: compiler $(addsuffix _all,$(TARGET_DIRS))
compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME) compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME)
multi-compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME)
ifeq ($(MAKELEVEL),0) ifeq ($(MAKELEVEL),0)
ifndef STARTTIME ifndef STARTTIME
ifdef DATE ifdef DATE
@ -4148,25 +4143,6 @@ endif
$(COMPILER) pp.pas $(COMPILER) pp.pas
$(EXECPPAS) $(EXECPPAS)
$(MOVE) $(COMPILER_TARGETDIR)/$(PPEXENAME) $(EXENAME) $(MOVE) $(COMPILER_TARGETDIR)/$(PPEXENAME) $(EXENAME)
$(MULTIEXENAME) : $(wildcard *.pas) $(wildcard *.inc) msg \
$(wildcard systems/*.pas) $(wilcard systems/*.inc) \
$(wildcard $(CPC_TARGET)/*.pas) $(wildcard $(CPC_TARGET)/*.inc) \
$(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR)
ifneq ($(REVSTR),)
ifdef USEZIPWRAPPER
ifneq ($(ECHOREDIR),echo)
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
else
$(ECHOREDIR) '$(REVSTR)' > revision.inc
endif
else
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
endif
$(COMPILER) version.pas
endif
$(COMPILER) multipp.pas
$(EXECPPAS)
$(MOVE) $(COMPILER_TARGETDIR)/$(PPMULTIEXENAME) $(MULTIEXENAME)
.PHONY: cycle fullcycle wpocycle .PHONY: cycle fullcycle wpocycle
ifeq ($(CPU_SOURCE),$(PPC_TARGET)) ifeq ($(CPU_SOURCE),$(PPC_TARGET))
ifeq ($(OS_SOURCE),$(OS_TARGET)) ifeq ($(OS_SOURCE),$(OS_TARGET))

28
compiler/Makefile.fpc
View File

@ -387,11 +387,7 @@ endif
ifndef EXENAME ifndef EXENAME
EXENAME=ppc$(CPUSUF)$(EXEEXT) EXENAME=ppc$(CPUSUF)$(EXEEXT)
endif endif
ifndef MULTIEXENAME
MULTIEXENAME=multippc$(CPUSUF)$(EXEEXT)
endif
PPEXENAME=pp$(EXEEXT) PPEXENAME=pp$(EXEEXT)
PPMULTIEXENAME=multipp$(EXEEXT)
TEMPNAME=ppc$(SRCEXEEXT) TEMPNAME=ppc$(SRCEXEEXT)
ifneq ($(CPUSUF),jvm) ifneq ($(CPUSUF),jvm)
PPCROSSNAME=ppcross$(CPUSUF)$(SRCEXEEXT) PPCROSSNAME=ppcross$(CPUSUF)$(SRCEXEEXT)
@ -445,8 +441,6 @@ all: compiler $(addsuffix _all,$(TARGET_DIRS))
compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME) compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME)
multi-compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME)
ifeq ($(MAKELEVEL),0) ifeq ($(MAKELEVEL),0)
ifndef STARTTIME ifndef STARTTIME
ifdef DATE ifdef DATE
@ -600,28 +594,6 @@ endif
$(EXECPPAS) $(EXECPPAS)
$(MOVE) $(COMPILER_TARGETDIR)/$(PPEXENAME) $(EXENAME) $(MOVE) $(COMPILER_TARGETDIR)/$(PPEXENAME) $(EXENAME)
# Make only the compiler
# ECHOREDIR sometimes does not remove double quotes
$(MULTIEXENAME) : $(wildcard *.pas) $(wildcard *.inc) msg \
$(wildcard systems/*.pas) $(wilcard systems/*.inc) \
$(wildcard $(CPC_TARGET)/*.pas) $(wildcard $(CPC_TARGET)/*.inc) \
$(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR)
ifneq ($(REVSTR),)
ifdef USEZIPWRAPPER
ifneq ($(ECHOREDIR),echo)
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
else
$(ECHOREDIR) '$(REVSTR)' > revision.inc
endif
else
$(ECHOREDIR) "'$(REVSTR)'" > revision.inc
endif
$(COMPILER) version.pas
endif
$(COMPILER) multipp.pas
$(EXECPPAS)
$(MOVE) $(COMPILER_TARGETDIR)/$(PPMULTIEXENAME) $(MULTIEXENAME)
##################################################################### #####################################################################
# Cycle targets # Cycle targets