Author: dim
Date: Sat Jan 20 04:20:35 2018
New Revision: 323038
URL: http://llvm.org/viewvc/llvm-project?rev=323038&view=rev
Log:
Merging r322875:
------------------------------------------------------------------------
r322875 | dim | 2018-01-18 19:39:13 +0100 (Thu, 18 Jan 2018) | 9 lines
Add a -no-libcxxabi option to the test-release.sh script.
On FreeBSD, it is currently not possible to build libcxxabi and link
against it, so we have been building releases with -no-libs for quite
some time.
However, libcxx and libunwind should build without problems, so provide
an option to skip just libcxxabi.
------------------------------------------------------------------------
Merging r322879:
------------------------------------------------------------------------
r322879 | dim | 2018-01-18 20:30:30 +0100 (Thu, 18 Jan 2018) | 2 lines
Follow-up to rL322875 by initializing the do_libcxxabi variable properly.
------------------------------------------------------------------------
Modified:
llvm/branches/release_60/ (props changed)
llvm/branches/release_60/utils/release/test-release.sh
Propchange: llvm/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 20 04:20:35 2018
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321980,321991,321993-321994,322003,322053,322056,322103,322106,322223,322272,322313,322473,322623,322644,322724
+/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321980,321991,321993-321994,322003,322053,322056,322103,322106,322223,322272,322313,322473,322623,322644,322724,322875,322879
Modified: llvm/branches/release_60/utils/release/test-release.sh
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/utils/release/test-release.sh?rev=323038&r1=323037&r2=323038&view=diff
==============================================================================
--- llvm/branches/release_60/utils/release/test-release.sh (original)
+++ llvm/branches/release_60/utils/release/test-release.sh Sat Jan 20 04:20:35
2018
@@ -33,6 +33,7 @@ do_asserts="no"
do_compare="yes"
do_rt="yes"
do_libs="yes"
+do_libcxxabi="yes"
do_libunwind="yes"
do_test_suite="yes"
do_openmp="yes"
@@ -62,6 +63,7 @@ function usage() {
echo " For example -svn-path trunk or -svn-path
branches/release_37"
echo " -no-rt Disable check-out & build Compiler-RT"
echo " -no-libs Disable check-out & build
libcxx/libcxxabi/libunwind"
+ echo " -no-libcxxabi Disable check-out & build libcxxabi"
echo " -no-libunwind Disable check-out & build libunwind"
echo " -no-test-suite Disable check-out & build test-suite"
echo " -no-openmp Disable check-out & build libomp"
@@ -135,6 +137,9 @@ while [ $# -gt 0 ]; do
-no-libs )
do_libs="no"
;;
+ -no-libcxxabi )
+ do_libcxxabi="no"
+ ;;
-no-libunwind )
do_libunwind="no"
;;
@@ -206,7 +211,10 @@ if [ $do_rt = "yes" ]; then
projects="$projects compiler-rt"
fi
if [ $do_libs = "yes" ]; then
- projects="$projects libcxx libcxxabi"
+ projects="$projects libcxx"
+ if [ $do_libcxxabi = "yes" ]; then
+ projects="$projects libcxxabi"
+ fi
if [ $do_libunwind = "yes" ]; then
projects="$projects libunwind"
fi
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
