Date: Sun, 14 Aug 2022 11:15:52 GMT From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8534e6be8110 - main - Avoid using TARGET_ARCH in llvm.build.mk Message-ID: <202208141115.27EBFqFf053968@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8534e6be8110a8126268a38dc0557a2d15615ce9 commit 8534e6be8110a8126268a38dc0557a2d15615ce9 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2022-08-14 11:10:48 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2022-08-14 11:11:52 +0000 Avoid using TARGET_ARCH in llvm.build.mk Apparently the TARGET_ARCH macro is not supposed to be used outside of the top-level Makefiles. Directly use MACHINE_ARCH instead. Noticed by: imp, jrtc27 MFC after: 1 week --- lib/clang/llvm.build.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index dd54bf7312d9..7fe279078397 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -30,22 +30,21 @@ CFLAGS+= -DHAVE_VCS_VERSION_INC CFLAGS+= -DNDEBUG .endif -TARGET_ARCH?= ${MACHINE_ARCH} BUILD_ARCH?= ${MACHINE_ARCH} # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. # arm (for armv4 and armv5 CPUs) always uses the soft float ABI. # For all other targets, we stick with 'unknown'. -.if ${TARGET_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") +.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") TARGET_ABI= -gnueabihf -.elif ${TARGET_ARCH:Marm*} +.elif ${MACHINE_ARCH:Marm*} TARGET_ABI= -gnueabi .else TARGET_ABI= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_ABI} +LLVM_TARGET_TRIPLE?= ${MACHINE_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}\"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208141115.27EBFqFf053968>