diff options
| author | Alfredo Dal'Ava Junior <alfredo@FreeBSD.org> | 2022-05-03 11:09:38 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2024-01-07 23:04:32 +0000 |
| commit | f252e69e93d10e5b8c51ba7c99c88e98be2c1c56 (patch) | |
| tree | 427b421d8fff18f2a6295a7c03a2dbef33e78280 /share | |
| parent | 32079aae00debf26a4ddcef155f7a963308efb8d (diff) | |
| download | src-f252e69e93d10e5b8c51ba7c99c88e98be2c1c56.tar.gz src-f252e69e93d10e5b8c51ba7c99c88e98be2c1c56.zip | |
build target triple variable from sys/conf/newvers.sh
Retrieve FreeBSD revision number directly from sys/conf/newvers.sh
when building the compiler target triple value, avoiding manual
intervention on other files every new release.
Reviewed by: imp
MFC after: 2 months
Sponsored by: Instituto de Pesquisas Eldorado (eldorado.org.br)
Differential Revision: https://reviews.freebsd.org/D34429
(cherry picked from commit f9ee4156741a205c93ae947595b5c48717107d9e)
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.compat.mk | 8 | ||||
| -rw-r--r-- | share/mk/src.sys.env.mk | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 1cb6ab9567c9..ef485b843f99 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -29,7 +29,7 @@ LIB32CPUFLAGS= -march=${COMPAT_CPUTYPE} .endif .if ${COMPAT_COMPILER_TYPE} == gcc .else -LIB32CPUFLAGS+= -target x86_64-unknown-freebsd13.2 +LIB32CPUFLAGS+= -target x86_64-unknown-freebsd${OS_REVISION} .endif LIB32CPUFLAGS+= -m32 LIB32_MACHINE= i386 @@ -50,7 +50,7 @@ LIB32CPUFLAGS= -mcpu=${COMPAT_CPUTYPE} .if ${COMPAT_COMPILER_TYPE} == "gcc" LIB32CPUFLAGS+= -m32 .else -LIB32CPUFLAGS+= -target powerpc-unknown-freebsd13.2 +LIB32CPUFLAGS+= -target powerpc-unknown-freebsd${OS_REVISION} .endif LIB32_MACHINE= powerpc @@ -68,9 +68,9 @@ LIB32CPUFLAGS= -march=${COMPAT_CPUTYPE} .endif .else .if ${COMPAT_ARCH:Mmips64el*} != "" -LIB32CPUFLAGS= -target mipsel-unknown-freebsd13.2 +LIB32CPUFLAGS= -target mipsel-unknown-freebsd${OS_REVISION} .else -LIB32CPUFLAGS= -target mips-unknown-freebsd13.2 +LIB32CPUFLAGS= -target mips-unknown-freebsd${OS_REVISION} .endif .endif LIB32CPUFLAGS+= -mabi=32 diff --git a/share/mk/src.sys.env.mk b/share/mk/src.sys.env.mk index 0a7f8ea800cc..c857972e47c4 100644 --- a/share/mk/src.sys.env.mk +++ b/share/mk/src.sys.env.mk @@ -22,6 +22,11 @@ RELTOP?= ${RELDIR:C,[^/]+,..,g} RELOBJTOP?= ${RELTOP} RELSRCTOP?= ${RELTOP} +.if !defined(OS_REVISION) +OS_REVISION!=eval `sh ${SRCTOP}/sys/conf/newvers.sh -V REVISION` && echo $$REVISION || echo +.export OS_REVISION +.endif + # site customizations that do not depend on anything! # Save MAKEOBJDIRPREFIX and don't let src-env.conf modify it. |