Date: Fri, 16 Sep 2022 17:29:13 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 25e93187069e - main - devel/llvm-devel: fix name collision Message-ID: <202209161729.28GHTDiW000755@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=25e93187069e74c4050dd39f1f38075a8b597b2c commit 25e93187069e74c4050dd39f1f38075a8b597b2c Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2022-09-16 17:27:03 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2022-09-16 17:28:52 +0000 devel/llvm-devel: fix name collision Use _COMPILER_RT_LIBS rather than COMPILER_RT_LIBS for the list of library paths installed by the COMPILER_RT option. This worked because it was added after bsd.port.options.mk, but triggered a bsd.sanity.mk warning. PR: 266447 --- devel/llvm-devel/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 77b4d11bf92b..e9ae8881b277 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -131,7 +131,7 @@ CLANG_USE= PERL5=run .endif COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_IMPLIES= CLANG -COMPILER_RT_PLIST_FILES=${COMPILER_RT_LIBS} \ +COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} \ ${COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|} DOCS_PORTDOCS= llvm DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ @@ -340,9 +340,9 @@ _CRTLIBDIR= ${_CRTBASEDIR}/lib .include "Makefile.RUNTIMES" -COMPILER_RT_LIBS= +_COMPILER_RT_LIBS= .for CRT_ARCH in ${COMPILER_RT_ARCHS} -COMPILER_RT_LIBS:= ${COMPILER_RT_LIBS} ${COMPILER_RT_LIBS_${CRT_ARCH}:S|^|${_CRTLIBDIR}/${CRT_ARCH}-portbld-${OPSYS:tl}${OSREL}/|} +_COMPILER_RT_LIBS:= ${_COMPILER_RT_LIBS} ${COMPILER_RT_LIBS_${CRT_ARCH}:S|^|${_CRTLIBDIR}/${CRT_ARCH}-portbld-${OPSYS:tl}${OSREL}/|} .endfor # Comment out plist entries for unsupported options.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209161729.28GHTDiW000755>