paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-17 13:20:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Remove debug ECHO lines

Browse Source 
* Fix detection of -dFPC_SOFT_FPUX80, as OPT is reset after
     being copied over to LOCALOPT.
   + Add FULL_TARGETS that list all targets concerned by fullcyle and associated targets.

git-svn-id: trunk@46532 -
This commit is contained in:
pierre 2020-08-21 09:13:59 +00:00
parent 51b43aff3f
commit 85d19af48c
2 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/Makefile
View File

@ -4729,7 +4729,6 @@ $(INSTALL_TARGETS):
$(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) exeinstall $(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) exeinstall
$(SYMLINKINSTALL_TARGETS): $(SYMLINKINSTALL_TARGETS):
$(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) compiler $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) compiler
$(ECHO) "Compiler $(subst _symlink_install,,$@) finished, starting installsymlink"
$(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink
alltargets: $(ALLTARGETS) alltargets: $(ALLTARGETS)
.PHONY: all compiler echotime ppuclean execlean clean distclean .PHONY: all compiler echotime ppuclean execlean clean distclean
@ -4994,7 +4993,7 @@ extcycle:
$(MAKE) cycle OPT="$(OPT) -n -OG2p3 -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1 $(MAKE) cycle OPT="$(OPT) -n -OG2p3 -glttt -CRriot -dEXTDEBUG" ALLOW_WARNINGS=1
cvstest: cvstest:
$(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPT=-n -Se' $(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPT=-n -Se'
ifeq ($(findstring -dFPC_SOFT_FPUX80,$(OPT)),) ifeq ($(findstring -dFPC_SOFT_FPUX80,$(LOCALOPT)),)
ifeq ($(OS_SOURCE),win64) ifeq ($(OS_SOURCE),win64)
EXCLUDE_80BIT_TARGETS=1 EXCLUDE_80BIT_TARGETS=1
endif endif
@ -5002,6 +5001,11 @@ ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc p
EXCLUDE_80BIT_TARGETS=1 EXCLUDE_80BIT_TARGETS=1
endif endif
endif endif
ifndef EXCLUDE_80BIT_TARGETS
FULL_TARGETS=$(filter-out $(PPC_TARGET),$(CYCLETARGETS))
else
FULL_TARGETS=$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS))))
endif
full: fullcycle full: fullcycle
fullcycle: fullcycle:
$(MAKE) distclean $(MAKE) distclean
@ -5011,11 +5015,7 @@ ifdef DOWPOCYCLE
$(MAKE) rtlclean $(MAKE) rtlclean
$(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)' $(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
endif endif
ifndef EXCLUDE_80BIT_TARGETS $(MAKE) $(FULL_TARGETS) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
$(MAKE) $(filter-out $(PPC_TARGET),$(CYCLETARGETS)) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
else
$(MAKE) $(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
endif
htmldocs: htmldocs:
$(PASDOC) -p -h -o html$(PATHSEP)$(PPC_TARGET) -d fpc -d gdb -d $(PPC_TARGET) -u $(PPC_TARGET) $(PPC_TARGET)$(PATHSEP)*.pas systems$(PATHSEP)*.pas *.pas $(PASDOC) -p -h -o html$(PATHSEP)$(PPC_TARGET) -d fpc -d gdb -d $(PPC_TARGET) -u $(PPC_TARGET) $(PPC_TARGET)$(PATHSEP)*.pas systems$(PATHSEP)*.pas *.pas
.PHONY: quickinstall exeinstall install installsymlink fullinstall fullinstallsymlink .PHONY: quickinstall exeinstall install installsymlink fullinstall fullinstallsymlink
@ -5041,11 +5041,7 @@ endif
$(INSTALLEXE) $(INSTALLEXEFILE) $(PPCCPULOCATION)/$(INSTALLEXEFILE) $(INSTALLEXE) $(INSTALLEXEFILE) $(PPCCPULOCATION)/$(INSTALLEXEFILE)
endif endif
fullinstall: fullinstall:
ifndef EXCLUDE_80BIT_TARGETS $(MAKE) $(addsuffix _exe_install,$($(FULL_TARGETS)))
$(MAKE) $(addsuffix _exe_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
else
$(MAKE) $(addsuffix _exe_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))))
endif
$(MAKE) $(addsuffix _all,$(TARGET_DIRS)) $(MAKE) $(addsuffix _all,$(TARGET_DIRS))
$(MAKE) $(addsuffix _install,$(TARGET_DIRS)) $(MAKE) $(addsuffix _install,$(TARGET_DIRS))
auxfilesinstall: auxfilesinstall:
@ -5069,12 +5065,7 @@ ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME) ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME)
endif endif
fullinstallsymlink: fullinstallsymlink:
$(ECHO) "Fullinstall finished, starting XXX_symlink_install" $(MAKE) $(addsuffix _symlink_install,$(FULL_TARGETS))
ifndef EXCLUDE_80BIT_TARGETS
$(MAKE) $(addsuffix _symlink_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
else
$(MAKE) $(addsuffix _symlink_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))))
endif
.PHONY: rtl rtlclean rtlinstall .PHONY: rtl rtlclean rtlinstall
rtl: rtl:
$(MAKE) -C $(PACKAGEDIR_RTL) 'OPT=$(RTLOPT)' all $(MAKE) -C $(PACKAGEDIR_RTL) 'OPT=$(RTLOPT)' all

28
compiler/Makefile.fpc
View File

@ -619,7 +619,6 @@ $(INSTALL_TARGETS):
$(SYMLINKINSTALL_TARGETS): $(SYMLINKINSTALL_TARGETS):
$(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) compiler $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) compiler
$(ECHO) "Compiler $(subst _symlink_install,,$@) finished, starting installsymlink"
$(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink $(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink
alltargets: $(ALLTARGETS) alltargets: $(ALLTARGETS)
@ -1017,7 +1016,7 @@ cvstest:
# This is also the case for other CPUs that don't support # This is also the case for other CPUs that don't support
# 80bit real type. # 80bit real type.
ifeq ($(findstring -dFPC_SOFT_FPUX80,$(OPT)),) ifeq ($(findstring -dFPC_SOFT_FPUX80,$(LOCALOPT)),)
ifeq ($(OS_SOURCE),win64) ifeq ($(OS_SOURCE),win64)
EXCLUDE_80BIT_TARGETS=1 EXCLUDE_80BIT_TARGETS=1
endif endif
@ -1027,6 +1026,12 @@ ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc p
endif endif
endif endif
ifndef EXCLUDE_80BIT_TARGETS
FULL_TARGETS=$(filter-out $(PPC_TARGET),$(CYCLETARGETS))
else
FULL_TARGETS=$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS))))
endif
full: fullcycle full: fullcycle
fullcycle: fullcycle:
@ -1037,11 +1042,7 @@ ifdef DOWPOCYCLE
$(MAKE) rtlclean $(MAKE) rtlclean
$(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)' $(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
endif endif
ifndef EXCLUDE_80BIT_TARGETS $(MAKE) $(FULL_TARGETS) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
$(MAKE) $(filter-out $(PPC_TARGET),$(CYCLETARGETS)) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
else
$(MAKE) $(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)'
endif
##################################################################### #####################################################################
# Docs # Docs
@ -1087,11 +1088,7 @@ endif
endif endif
fullinstall: fullinstall:
ifndef EXCLUDE_80BIT_TARGETS $(MAKE) $(addsuffix _exe_install,$($(FULL_TARGETS)))
$(MAKE) $(addsuffix _exe_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
else
$(MAKE) $(addsuffix _exe_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))))
endif
$(MAKE) $(addsuffix _all,$(TARGET_DIRS)) $(MAKE) $(addsuffix _all,$(TARGET_DIRS))
$(MAKE) $(addsuffix _install,$(TARGET_DIRS)) $(MAKE) $(addsuffix _install,$(TARGET_DIRS))
@ -1123,12 +1120,7 @@ ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
endif endif
fullinstallsymlink: fullinstallsymlink:
$(ECHO) "Fullinstall finished, starting XXX_symlink_install" $(MAKE) $(addsuffix _symlink_install,$(FULL_TARGETS))
ifndef EXCLUDE_80BIT_TARGETS
$(MAKE) $(addsuffix _symlink_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
else
$(MAKE) $(addsuffix _symlink_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))))
endif
##################################################################### #####################################################################