git: 8aaa12308992 - main - Makefile.libcompat: Fix DTRACE variable
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 10 Aug 2023 23:55:31 UTC
The branch main has been updated by jrtc27:
URL: https://cgit.FreeBSD.org/src/commit/?id=8aaa1230899239a90f35e73436377a6f5f79bbf9
commit 8aaa1230899239a90f35e73436377a6f5f79bbf9
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-08-10 23:48:01 +0000
Commit: Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-08-10 23:48:01 +0000
Makefile.libcompat: Fix DTRACE variable
Back when Makefile.lib32 was turned into Makefile.libcompat, a typo was
introduced; it should have been LIBCOMPATDTRACE, but instead gained a
dollar sign in it as LIB$COMPATDTRACE (and with COMPATDTRACE not being
defined, was equivalent to ${LIB:U${DTRACE}}). This then meant it was
not converted to LIB${_LIBCOMPAT}DTRACE in 91d7edd549f5 ("Generalise
libcompat to be a list rather than a single option") and instead left
broken. Belatedly fix this long-standing seemingly-inconsequential bug.
Fixes: dba75e9fa5a9 ("Move Makefile.lib32 to Makefile.libcompat and generalize it.")
---
Makefile.libcompat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.libcompat b/Makefile.libcompat
index da9c326756aa..c4a98773f1bd 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -20,7 +20,7 @@ LIB${_LIBCOMPAT}WMAKEENV+= \
LIBDIR=/usr/lib${libcompat} \
SHLIBDIR=/usr/lib${libcompat} \
LIBDATADIR=/usr/lib${libcompat} \
- DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
+ DTRACE="${LIB${_LIBCOMPAT}DTRACE:U${DTRACE}}"
.if ${MK_META_MODE} != "no"
# Don't rebuild build-tools targets during normal build.
LIB${_LIBCOMPAT}WMAKEENV+= BUILD_TOOLS_META=.NOMETA