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

* check if git executable really exists

Browse Source
This commit is contained in:
florian 2021-08-21 20:36:29 +02:00 committed by Michaël Van Canneyt
parent 848bd3e0c0
commit b4f939a4ab
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/Makefile
View File

@ -461,9 +461,11 @@ ifdef SOURCE_DATE_EPOCH
else else
GIT_DIR = $(wildcard ../.git) GIT_DIR = $(wildcard ../.git)
ifneq ($(GIT_DIR),) ifneq ($(GIT_DIR),)
ifneq ($(GIT),)
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
endif
ifdef COMPDATESTR ifdef COMPDATESTR
override OPTNEW+=-DD$(COMPDATESTR) override OPTNEW+=-DD$(COMPDATESTR)
endif endif

2
compiler/Makefile.fpc
View File

@ -182,9 +182,11 @@ 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
ifneq ($(GIT),)
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
endif
ifdef COMPDATESTR ifdef COMPDATESTR
override OPTNEW+=-DD$(COMPDATESTR) override OPTNEW+=-DD$(COMPDATESTR)