pkgsrc-WIP-changes archive

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

compiler-rt: fix install path



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Thu Apr 11 19:03:41 2024 +0200
Changeset:	21f27524070c9be5475cc56531e2a80456b0a6ae

Modified Files:
	compiler-rt/Makefile

Log Message:
compiler-rt: fix install path

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

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

diffstat:
 compiler-rt/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diffs:
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile
index 51cb15c662..398212a619 100644
--- a/compiler-rt/Makefile
+++ b/compiler-rt/Makefile
@@ -13,15 +13,17 @@ LICENSE=	apache-2.0
 
 NOT_FOR_PLATFORM=	NetBSD-[0-7].*-*
 
-USE_LANGUAGES=	c99 c++11
-USE_TOOLS+=	ggrep
-GCC_REQD+=	4.8
-SSP_SUPPORTED=	no
+USE_CC_FEATURES=	c99
+USE_CXX_FEATURES=	c++14
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		ggrep
+GCC_REQD+=		4.8
+SSP_SUPPORTED=		no
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCOMPILER_RT_TEST_COMPILER=${PKG_CC:Q}
 CMAKE_ARGS+=	-DCOMPILER_RT_OS_DIR:STRING=${OPSYS:tl}
-CMAKE_ARGS+=	-DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}
+CMAKE_ARGS+=	-DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${LLVM_MAJOR_VERSION}
 CMAKE_ARGS+=	-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=	-DCOMPILER_RT_ENABLE_IOS=OFF
 
@@ -34,7 +36,7 @@ PYTHON_FOR_BUILD_ONLY=	yes
 
 post-install:
 	cd ${DESTDIR}${PREFIX} && \
-	${FIND} lib/clang/${PKGVERSION_NOREV} -type f -name '*.dylib' \
+	${FIND} lib/clang/${LLVM_MAJOR_VERSION} -type f -name '*.dylib' \
 		-exec install_name_tool -id ${PREFIX}/{} {} \;
 
 .include "../../devel/cmake/build.mk"


Home | Main Index | Thread Index | Old Index