[Midnightbsd-cvs] mports [24314] trunk/devel/llvm40/Makefile: compiler rt is not always working.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 12 17:48:41 EDT 2018
Revision: 24314
http://svnweb.midnightbsd.org/mports/?rev=24314
Author: laffer1
Date: 2018-09-12 17:48:40 -0400 (Wed, 12 Sep 2018)
Log Message:
-----------
compiler rt is not always working. disable for now as a default.
Modified Paths:
--------------
trunk/devel/llvm40/Makefile
Modified: trunk/devel/llvm40/Makefile
===================================================================
--- trunk/devel/llvm40/Makefile 2018-09-12 20:14:13 UTC (rev 24313)
+++ trunk/devel/llvm40/Makefile 2018-09-12 21:48:40 UTC (rev 24314)
@@ -49,8 +49,8 @@
OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP
OPTIONS_DEFINE_i386= COMPILER_RT
OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD
-OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP
-OPTIONS_DEFAULT_i386= COMPILER_RT
+OPTIONS_DEFAULT_amd64= GOLD OPENMP
+OPTIONS_DEFAULT_i386=
OPTIONS_SUB= yes
CLANG_DESC= Build clang
@@ -100,7 +100,7 @@
STRIP=
.endif
-_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd
+_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/midnightbsd
# Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
.for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
@@ -376,8 +376,8 @@
${FAKE_DESTDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
.endfor
.if ! ${PORT_OPTIONS:MLIT}
- ${RM} ${FAKE_DESTDIR}${LLVM_PREFIX}/share/man/man1/lit.1
- ${RM} ${FAKE_DESTDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
+ -${RM} ${FAKE_DESTDIR}${LLVM_PREFIX}/share/man/man1/lit.1
+ -${RM} ${FAKE_DESTDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
.endif
${RMDIR} ${FAKE_DESTDIR}${LLVM_PREFIX}/share/man/man1/
${RMDIR} ${FAKE_DESTDIR}${LLVM_PREFIX}/share/man/
@@ -403,12 +403,12 @@
cd ${WRKDIR}/compiler-rt-build && \
${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
.if ${ARCH} == "amd64"
- ${RM} ${FAKE_DESTDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
+ -${RM} ${FAKE_DESTDIR}${LLVM_PREFIX}/lib/midnightbsd/libclang_rt*i386*
.endif
${MKDIR} ${FAKE_DESTDIR}${PREFIX}/${_CRTLIBDIR}
- ${MV} ${FAKE_DESTDIR}${LLVM_PREFIX}/lib/freebsd/* \
+ ${MV} ${FAKE_DESTDIR}${LLVM_PREFIX}/lib/midnightbsd/* \
${FAKE_DESTDIR}${PREFIX}/${_CRTLIBDIR}
- ${RMDIR} ${FAKE_DESTDIR}${LLVM_PREFIX}/lib/freebsd
+ -${RMDIR} ${FAKE_DESTDIR}${LLVM_PREFIX}/lib/midnightbsd
post-install-LIT-on:
${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
More information about the Midnightbsd-cvs
mailing list