diff options
| author | ian <ian@FreeBSD.org> | 2013-09-21 22:36:07 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2013-09-21 22:36:07 +0000 |
| commit | be20f1474519ef183bd8439ec2df91b6cc2b641c (patch) | |
| tree | 1cc7841aa918d44e6c78e3f0eb1caae1fbbf1faa /include/Makefile | |
| parent | b32fed86db62816ab222f56c1f859a444ac8648b (diff) | |
| download | FreeBSD-src-be20f1474519ef183bd8439ec2df91b6cc2b641c.zip FreeBSD-src-be20f1474519ef183bd8439ec2df91b6cc2b641c.tar.gz | |
Create a separate script to generate osreldate.h rather than sourcing
newvers.sh into a temporary subshell with inline make rules.
Using a separate script fixes a variety of problems, including establishing
the correct dependencies in the makefiles. It also eliminates a problem
with the way newvers.sh uses `realpath $0`, because $0 expands differently
within a script sourced into a rule in a makefile depending on the version
of make and of /bin/sh being used. The latter can cause build breakage in a
cross-build environment, and can also make it difficult to compile 10.0 on
older pre-10.0 systems.
PR: 160646 174422
Submitted by: Garrett Cooper <yaneurabeya@gmail.com>
Approved by: re (gjb)
MFC after: 2 weeks
Diffstat (limited to 'include/Makefile')
| -rw-r--r-- | include/Makefile | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/include/Makefile b/include/Makefile index ba41814..0559e2a 100644 --- a/include/Makefile +++ b/include/Makefile @@ -104,19 +104,16 @@ SHARED?= copies INCS+= osreldate.h -osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh ${.CURDIR}/../sys/sys/param.h \ - ${.CURDIR}/Makefile - @${ECHO} creating osreldate.h from newvers.sh - @MAKE=${MAKE}; \ - PARAMFILE=${.CURDIR}/../sys/sys/param.h; \ - . ${.CURDIR}/../sys/conf/newvers.sh; \ - echo "$$COPYRIGHT" > osreldate.h; \ - echo "#ifdef _KERNEL" >> osreldate.h; \ - echo "#error \"<osreldate.h> cannot be used in the kernel, use <sys/param.h>\"" >> osreldate.h; \ - echo "#else" >> osreldate.h; \ - echo "#undef __FreeBSD_version" >> osreldate.h; \ - echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ - echo "#endif" >> osreldate.h +NEWVERS_SH= ${.CURDIR}/../sys/conf/newvers.sh +PARAM_H= ${.CURDIR}/../sys/sys/param.h +MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh + +osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH} + env ECHO="${ECHO}" \ + MAKE="${MAKE}" \ + NEWVERS_SH=${NEWVERS_SH} \ + PARAM_H=${PARAM_H} \ + ${MK_OSRELDATE_SH} .for i in ${LHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i |
