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

* Revert merge of commits 46507, 46510 and 46532,

Browse Source 
because it broke 'make singlezipinstall'

git-svn-id: branches/fixes_3_2@46718 -
This commit is contained in:
pierre 2020-08-27 20:02:16 +00:00
parent 919c932443
commit 74ce84f8e4
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
compiler/Makefile
View File

@ -4062,7 +4062,6 @@ release: fpc_release
units: fpc_units $(addsuffix _units,$(TARGET_DIRS)) units: fpc_units $(addsuffix _units,$(TARGET_DIRS))
examples: $(addsuffix _examples,$(TARGET_DIRS)) examples: $(addsuffix _examples,$(TARGET_DIRS))
shared: fpc_shared shared: fpc_shared
install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
sourceinstall: fpc_sourceinstall sourceinstall: fpc_sourceinstall
exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS)) exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
distinstall: fpc_distinstall distinstall: fpc_distinstall
@ -4073,7 +4072,7 @@ zipdistinstall: fpc_zipdistinstall
cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS)) cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
info: fpc_info info: fpc_info
makefiles: fpc_makefiles makefiles: fpc_makefiles
.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles .PHONY: debug smart release units examples shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
ifneq ($(wildcard fpcmake.loc),) ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
@ -4128,13 +4127,11 @@ INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS))) SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
.PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS) .PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS)
$(PPC_TARGETS): $(PPC_TARGETS):
$(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ compiler $(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ all
$(INSTALL_TARGETS): $(INSTALL_TARGETS):
$(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) compiler $(MAKE) all install PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@)
$(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) all installsymlink PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@)
$(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink
alltargets: $(ALLTARGETS) alltargets: $(ALLTARGETS)
.NOTPARALLEL: .NOTPARALLEL:
.PHONY: all compiler echotime ppuclean execlean clean distclean .PHONY: all compiler echotime ppuclean execlean clean distclean
@ -4355,19 +4352,12 @@ 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,$(LOCALOPT)),)
ifeq ($(OS_SOURCE),win64) ifeq ($(OS_SOURCE),win64)
EXCLUDE_80BIT_TARGETS=1 EXCLUDE_80BIT_TARGETS=1
endif endif
ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc powerpc64 sparc sparc64),) ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc powerpc64 sparc sparc64),)
EXCLUDE_80BIT_TARGETS=1 EXCLUDE_80BIT_TARGETS=1
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) cycle $(MAKE) cycle
@ -4376,7 +4366,11 @@ ifdef DOWPOCYCLE
$(MAKE) rtlclean $(MAKE) rtlclean
$(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAME)' $(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAME)'
endif endif
$(MAKE) $(FULL_TARGETS) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)' ifndef EXCLUDE_80BIT_TARGETS
$(MAKE) $(filter-out $(PPC_TARGET),$(CYCLETARGETS)) 'FPC=$(BASEDIR)/$(EXENAME)'
else
$(MAKE) $(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))) 'FPC=$(BASEDIR)/$(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
@ -4402,10 +4396,12 @@ endif
$(INSTALLEXE) $(INSTALLEXEFILE) $(PPCCPULOCATION)/$(INSTALLEXEFILE) $(INSTALLEXE) $(INSTALLEXEFILE) $(PPCCPULOCATION)/$(INSTALLEXEFILE)
endif endif
fullinstall: fullinstall:
$(MAKE) $(addsuffix _exe_install,$($(FULL_TARGETS))) ifndef EXCLUDE_80BIT_TARGETS
$(MAKE) $(addsuffix _all,$(TARGET_DIRS)) $(MAKE) $(addsuffix _exe_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
$(MAKE) $(addsuffix _install,$(TARGET_DIRS)) else
auxfilesinstall: $(MAKE) $(addsuffix _exe_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))))
endif
install: quickinstall
ifndef CROSSINSTALL ifndef CROSSINSTALL
ifdef UNIXHier ifdef UNIXHier
$(MKDIR) $(INSTALL_BASEDIR) $(MKDIR) $(INSTALL_BASEDIR)
@ -4414,13 +4410,17 @@ endif
$(MKDIR) $(MSGINSTALLDIR) $(MKDIR) $(MSGINSTALLDIR)
$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR) $(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
endif endif
installsymlink: exeinstall installsymlink: install
ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR)) ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
$(MKDIR) $(INSTALL_BINDIR) $(MKDIR) $(INSTALL_BINDIR)
ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME) ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME)
endif endif
fullinstallsymlink: fullinstallsymlink: fullinstall
$(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

44
compiler/Makefile.fpc
View File

@ -440,15 +440,13 @@ SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC
.PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS) .PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS)
$(PPC_TARGETS): $(PPC_TARGETS):
$(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ compiler $(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ all
$(INSTALL_TARGETS): $(INSTALL_TARGETS):
$(MAKE) PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@) compiler $(MAKE) all install PPC_TARGET=$(subst _exe_install,,$@) CPU_UNITDIR=$(subst _exe_install,,$@)
$(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) all installsymlink PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@)
$(MAKE) PPC_TARGET=$(subst _symlink_install,,$@) CPU_UNITDIR=$(subst _symlink_install,,$@) installsymlink
alltargets: $(ALLTARGETS) alltargets: $(ALLTARGETS)
@ -800,7 +798,6 @@ 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,$(LOCALOPT)),)
ifeq ($(OS_SOURCE),win64) ifeq ($(OS_SOURCE),win64)
EXCLUDE_80BIT_TARGETS=1 EXCLUDE_80BIT_TARGETS=1
endif endif
@ -808,13 +805,6 @@ endif
ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc powerpc64 sparc sparc64),) ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc powerpc64 sparc sparc64),)
EXCLUDE_80BIT_TARGETS=1 EXCLUDE_80BIT_TARGETS=1
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
@ -825,7 +815,11 @@ ifdef DOWPOCYCLE
$(MAKE) rtlclean $(MAKE) rtlclean
$(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAME)' $(MAKE) rtl 'FPC=$(BASEDIR)/$(EXENAME)'
endif endif
$(MAKE) $(FULL_TARGETS) 'FPC=$(BASEDIR)/$(EXENAMEPREFIX)$(EXENAME)' ifndef EXCLUDE_80BIT_TARGETS
$(MAKE) $(filter-out $(PPC_TARGET),$(CYCLETARGETS)) 'FPC=$(BASEDIR)/$(EXENAME)'
else
$(MAKE) $(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))) 'FPC=$(BASEDIR)/$(EXENAME)'
endif
##################################################################### #####################################################################
# Docs # Docs
@ -871,11 +865,13 @@ endif
endif endif
fullinstall: fullinstall:
$(MAKE) $(addsuffix _exe_install,$($(FULL_TARGETS))) ifndef EXCLUDE_80BIT_TARGETS
$(MAKE) $(addsuffix _all,$(TARGET_DIRS)) $(MAKE) $(addsuffix _exe_install,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))
$(MAKE) $(addsuffix _install,$(TARGET_DIRS)) else
$(MAKE) $(addsuffix _exe_install,$(filter-out i8086,$(filter-out i386,$(filter-out $(PPC_TARGET),$(CYCLETARGETS)))))
auxfilesinstall: endif
install: quickinstall
ifndef CROSSINSTALL ifndef CROSSINSTALL
ifdef UNIXHier ifdef UNIXHier
$(MKDIR) $(INSTALL_BASEDIR) $(MKDIR) $(INSTALL_BASEDIR)
@ -887,14 +883,18 @@ endif
# This also installs a link from bin to the actual executable. # This also installs a link from bin to the actual executable.
# The .deb does that later. # The .deb does that later.
installsymlink: exeinstall installsymlink: install
ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR)) ifneq ($(PPCCPULOCATION),$(INSTALL_BINDIR))
$(MKDIR) $(INSTALL_BINDIR) $(MKDIR) $(INSTALL_BINDIR)
ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME) ln -sf $(INSTALL_BASEDIR)/$(EXENAME) $(INSTALL_BINDIR)/$(EXENAME)
endif endif
fullinstallsymlink: fullinstallsymlink: fullinstall
$(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
##################################################################### #####################################################################