Page MenuHomeFreeBSD
Files F97601439

D34429.diff
No OneTemporary
Actions

D34429.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -138,9 +138,9 @@
.endif
.endif
MACHINE_ABI?= unknown
-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_ABI}-freebsd14.0
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_ABI}-freebsd${OS_REVISION}
TARGET_ABI?= unknown
-TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_ABI}-freebsd14.0
+TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_ABI}-freebsd${OS_REVISION}
KNOWN_ARCHES?= aarch64/arm64 \
amd64 \
armv6/arm \
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -14,6 +14,10 @@
.error Please define SRCDIR before including this file
.endif
+.ifndef OS_REVISION
+.error Please define OS_REVISION before including this file
+.endif
+
.PATH: ${LLVM_BASE}/${SRCDIR}
CFLAGS+= -I${SRCTOP}/lib/clang/include
@@ -40,10 +44,9 @@
TARGET_ABI=
.endif
VENDOR= unknown
-OS_VERSION= freebsd14.0
-LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
-LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}
+LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_ABI}
+LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\"
CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\"
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -30,7 +30,7 @@
.endif
.if ${COMPAT_COMPILER_TYPE} == gcc
.else
-LIB32CPUFLAGS+= -target x86_64-unknown-freebsd14.0
+LIB32CPUFLAGS+= -target x86_64-unknown-freebsd${OS_REVISION}
.endif
LIB32CPUFLAGS+= -m32
LIB32_MACHINE= i386
@@ -51,7 +51,7 @@
.if ${COMPAT_COMPILER_TYPE} == "gcc"
LIB32CPUFLAGS+= -m32
.else
-LIB32CPUFLAGS+= -target powerpc-unknown-freebsd14.0
+LIB32CPUFLAGS+= -target powerpc-unknown-freebsd${OS_REVISION}
.endif
LIB32_MACHINE= powerpc
diff --git a/share/mk/src.sys.env.mk b/share/mk/src.sys.env.mk
--- a/share/mk/src.sys.env.mk
+++ b/share/mk/src.sys.env.mk
@@ -23,6 +23,11 @@
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.

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 7:18 AM (21 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13231019
Default Alt Text
D34429.diff (2 KB)

Event Timeline