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

Allow custom definition of GIT.

Browse Source
This commit is contained in:
Don 2021-08-19 07:51:36 +01:00
parent aa9ff6c225
commit f6636c9c1c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/Makefile
View File

@ -452,7 +452,9 @@ ifndef RTLOPT
RTLOPT:=$(OPT) RTLOPT:=$(OPT)
endif endif
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))) SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
ifndef GIT
GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH)))) GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
endif
DATE_FMT = +%Y/%m/%d DATE_FMT = +%Y/%m/%d
ifdef SOURCE_DATE_EPOCH ifdef SOURCE_DATE_EPOCH
COMPDATESTR ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u "$(DATE_FMT)") COMPDATESTR ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || date -u "$(DATE_FMT)")

3
compiler/Makefile.fpc
View File

@ -169,7 +169,10 @@ RTLOPT:=$(OPT)
endif endif
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))) SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
ifndef GIT
GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH)))) GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
endif
DATE_FMT = +%Y/%m/%d DATE_FMT = +%Y/%m/%d
ifdef SOURCE_DATE_EPOCH ifdef SOURCE_DATE_EPOCH