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

Add '.built.on.$(SOURCESUFFIX)' for snapshots generated on another target using singlezipinstall

Browse Source 
git-svn-id: trunk@44117 -
This commit is contained in:
pierre 2020-02-05 17:21:18 +00:00
parent 37106166f1
commit 6b9d3ead7a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -2935,7 +2935,11 @@ ifeq ($(findstring $(CPU_TARGET), $(BuildOnlyBaseCPUs)),)
endif endif
singlezipinstall: zipinstallall singlezipinstall: zipinstallall
zipinstallall: $(BUILDSTAMP) zipinstallall: $(BUILDSTAMP)
ifeq($(FULL_SOURCE),$(FULL_TARGET))
$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX) $(INSTALLOPTS) $(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX) $(INSTALLOPTS)
else
$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX).built.on.$(SOURCESUFFIX) $(INSTALLOPTS)
endif
.PHONY: crossall crossinstall crosszipinstall crosssinglezipinstall .PHONY: crossall crossinstall crosszipinstall crosssinglezipinstall
crossall: crossall:
$(MAKE) all CROSSINSTALL=1 $(MAKE) all CROSSINSTALL=1
@ -2944,4 +2948,4 @@ crossinstall:
crosszipinstall: crosszipinstall:
$(MAKE) zipinstall CROSSINSTALL=1 $(MAKE) zipinstall CROSSINSTALL=1
crosssinglezipinstall: crosssinglezipinstall:
$(MAKE) fpc_zipinstall ZIPTARGET=crossinstall ZIPNAME=fpc $(INSTALLOPTS) $(MAKE) fpc_zipinstall ZIPTARGET=crossinstall FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(SOURCESUFFIX).cross.$(TARGETSUFFIX) $(INSTALLOPTS)

8
Makefile.fpc
View File

@ -372,7 +372,11 @@ endif
singlezipinstall: zipinstallall singlezipinstall: zipinstallall
zipinstallall: $(BUILDSTAMP) zipinstallall: $(BUILDSTAMP)
$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX) $(INSTALLOPTS) ifeq($(FULL_SOURCE),$(FULL_TARGET))
$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX) $(INSTALLOPTS)
else
$(MAKE) fpc_zipinstall ZIPTARGET=install FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(TARGETSUFFIX).built.on.$(SOURCESUFFIX) $(INSTALLOPTS)
endif
########################################################################## ##########################################################################
@ -391,4 +395,4 @@ crosszipinstall:
$(MAKE) zipinstall CROSSINSTALL=1 $(MAKE) zipinstall CROSSINSTALL=1
crosssinglezipinstall: crosssinglezipinstall:
$(MAKE) fpc_zipinstall ZIPTARGET=crossinstall ZIPNAME=fpc $(INSTALLOPTS) $(MAKE) fpc_zipinstall ZIPTARGET=crossinstall FULLZIPNAME=fpc-$(PACKAGE_VERSION).$(SOURCESUFFIX).cross.$(TARGETSUFFIX) $(INSTALLOPTS)