Skip to content

Commit

Permalink
Makefile.inc1: Avoid using release/Makefile for VERSION.
Browse files Browse the repository at this point in the history
release/Makefile.inc1 has git executions that were being ran for each of
these lookups.  The results were not needed so just lookup what we want
directly instead.

Reviewed by:	gjb, rlibby, emaste (maybe)
Sponsored by:	Dell EMC
Differential Revision:	https://reviews.freebsd.org/D27643
  • Loading branch information
bdrewery committed Jan 8, 2021
1 parent cbc9be9 commit 44b8b2a
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -540,14 +540,12 @@ OSRELDATE= 0
.endif

# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
.if !defined(_REVISION)
_REVISION!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V REVISION
.export _REVISION
.endif
.if !defined(_BRANCH)
_BRANCH!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V BRANCH
.export _BRANCH
.for _V in BRANCH REVISION
.if !defined(_${_V})
_${_V}!= eval $$(awk '/^${_V}=/{print}' ${SRCTOP}/sys/conf/newvers.sh); echo $$${_V}
.export _${_V}
.endif
.endfor
.if !defined(SRCRELDATE)
SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
${SRCDIR}/sys/sys/param.h
Expand Down

0 comments on commit 44b8b2a

Please sign in to comment.