pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wasi-compiler-rt: fix for clang 16



Module Name:	pkgsrc-wip
Committed By:	nikita <nikita%NetBSD.org@localhost>
Pushed By:	nikita
Date:		Wed May 10 22:45:29 2023 +0200
Changeset:	2f768a93f8ede34f62e3e076344a914f5d3baaae

Modified Files:
	wasi-compiler-rt/Makefile

Log Message:
wasi-compiler-rt: fix for clang 16

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2f768a93f8ede34f62e3e076344a914f5d3baaae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wasi-compiler-rt/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diffs:
diff --git a/wasi-compiler-rt/Makefile b/wasi-compiler-rt/Makefile
index 1577c3cd74..2a765d08b6 100644
--- a/wasi-compiler-rt/Makefile
+++ b/wasi-compiler-rt/Makefile
@@ -53,7 +53,7 @@ CMAKE_ARGS+=	-DCMAKE_C_COMPILER_WORKS=1 # Do not test clang compile
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER_WORKS=1 # Do not test clang++ compile
 CMAKE_ARGS+=	-DCOMPILER_RT_ENABLE_IOS=OFF
 
-CMAKE_INSTALL_PREFIX=	${PREFIX}/lib/clang/${PKGVERSION_NOREV}
+CMAKE_INSTALL_PREFIX=	${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}
 
 GENERATE_PLIST+=	find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
 			sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
@@ -69,7 +69,7 @@ post-extract:
 .if ${OPSYS} != "Darwin"
 post-install:
 	${PREFIX}/bin/llvm-ranlib \
-	  ${DESTDIR}${PREFIX}/lib/clang/${PKGVERSION_NOREV}/lib/wasi/libclang_rt.builtins-wasm32.a
+	  ${DESTDIR}${PREFIX}/lib/clang/${LLVM_MAJOR_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a
 .endif
 
 ABI=			# 32


Home | Main Index | Thread Index | Old Index