Explorar o código

Allow custom definition of GIT.

Don %!s(int64=4) %!d(string=hai) anos
pai
achega
f6636c9c1c
Modificáronse 2 ficheiros con 5 adicións e 0 borrados
  1. 2 0
      compiler/Makefile
  2. 3 0
      compiler/Makefile.fpc

+ 2 - 0
compiler/Makefile

@@ -452,7 +452,9 @@ ifndef RTLOPT
 RTLOPT:=$(OPT)
 endif
 SVNVERSION:=$(firstword $(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))))
+ifndef GIT
 GIT:=$(firstword $(wildcard $(addsuffix /git$(SRCEXEEXT),$(SEARCHPATH))))
+endif
 DATE_FMT = +%Y/%m/%d
 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)")

+ 3 - 0
compiler/Makefile.fpc

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