compiler-rt: fix install path

diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile
index 51cb15c662fb6cdd137b3de90b9e4706b74d4f65..398212a6195de6ad5665c0a1d160ab6c6f585abe 100644 (file)
--- 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"