diff options
| author | Dimitry Andric <dimitry@andric.com> | 2018-01-20 12:20:35 +0000 |
|---|---|---|
| committer | Dimitry Andric <dimitry@andric.com> | 2018-01-20 12:20:35 +0000 |
| commit | d99428659c1b30d82759ef10c5712579453364b6 (patch) | |
| tree | 14d0a53cf53b9b6c7b88791d61a924653a074eac /utils | |
| parent | 86cf0a327887ec7d2e22423363cbd1e947370f5f (diff) | |
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.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_60@323038 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/release/test-release.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index 66a2c578083..440dee53c1b 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -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 |