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

* always use $(GIT) to call git

Browse Source 
(cherry picked from commit a4878d892c)

# Conflicts:
#	compiler/Makefile
This commit is contained in:
florian 2021-08-18 15:16:51 +02:00
parent 7ae51087e5
commit d1f11bb292
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/Makefile
View File

@ -403,17 +403,19 @@ endif
ifndef RTLOPT ifndef RTLOPT
RTLOPT:=$(OPT) RTLOPT:=$(OPT)
endif endif
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
DATE_FMT = +%Y/%m/%d DATE_FMT = +%Y/%m/%d
ifdef SOURCE_DATE_EPOCH ifdef SOURCE_DATE_EPOCH
DATESTR ?= $(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)")
else else
GIT_DIR = $(wildcard ../.git) GIT_DIR = $(wildcard ../.git)
ifneq ($(GIT_DIR),) ifneq ($(GIT_DIR),)
DATESTR:=$(shell git log -1 --pretty=%cd --date=format:'%Y/%m/%d') COMPDATESTR:=$(shell $(GIT) log -1 --pretty=%cd --date=format:'%Y/%m/%d')
endif endif
endif endif
ifdef DATESTR ifdef COMPDATESTR
override OPTNEW+=-DD$(DATESTR) override OPTNEW+=-DD$(COMPDATESTR)
endif endif
ifdef CYCLELEVEL ifdef CYCLELEVEL
ifeq ($(CYCLELEVEL),1) ifeq ($(CYCLELEVEL),1)
@ -495,8 +497,6 @@ CPUSUF=a64
endif endif
NOCPUDEF=1 NOCPUDEF=1
MSGFILE=msg/error$(FPCLANG).msg MSGFILE=msg/error$(FPCLANG).msg
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
PPUDUMPPROG:=$(firstword $(strip $(wildcard $(addsuffix /ppudump$(SRCEXEEXT),$(SEARCHPATH))))) PPUDUMPPROG:=$(firstword $(strip $(wildcard $(addsuffix /ppudump$(SRCEXEEXT),$(SEARCHPATH)))))
ifndef PPUDUMP ifndef PPUDUMP
ifdef PPUDUMPPROG ifdef PPUDUMPPROG

8
compiler/Makefile.fpc
View File

@ -129,6 +129,9 @@ ifndef RTLOPT
RTLOPT:=$(OPT) RTLOPT:=$(OPT)
endif endif
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
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)")
@ -137,7 +140,7 @@ else
GIT_DIR = $(wildcard ../.git) GIT_DIR = $(wildcard ../.git)
ifneq ($(GIT_DIR),) ifneq ($(GIT_DIR),)
# ... then take date from head # ... then take date from head
COMPDATESTR:=$(shell git log -1 --pretty=%cd --date=format:'%Y/%m/%d') COMPDATESTR:=$(shell $(GIT) log -1 --pretty=%cd --date=format:'%Y/%m/%d')
endif endif
endif endif
@ -237,9 +240,6 @@ NOCPUDEF=1
# Default message file # Default message file
MSGFILE=msg/error$(FPCLANG).msg MSGFILE=msg/error$(FPCLANG).msg
SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
PPUDUMPPROG:=$(firstword $(strip $(wildcard $(addsuffix /ppudump$(SRCEXEEXT),$(SEARCHPATH))))) PPUDUMPPROG:=$(firstword $(strip $(wildcard $(addsuffix /ppudump$(SRCEXEEXT),$(SEARCHPATH)))))
ifndef PPUDUMP ifndef PPUDUMP
ifdef PPUDUMPPROG ifdef PPUDUMPPROG