diff options
Diffstat (limited to 'helpers/llvm-projs')
| -rwxr-xr-x | helpers/llvm-projs | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/helpers/llvm-projs b/helpers/llvm-projs index 3429b89..ecc9d0e 100755 --- a/helpers/llvm-projs +++ b/helpers/llvm-projs @@ -12,7 +12,7 @@ prog=`basename $0` syntax() { echo "Syntax: $prog [clang|lldb|lld|rt|libs|all|none] {+/-}[c|x|r|k|d|l|a|u|t]" echo " no args: List linked projects" - echo " clang: Clang + Clang Tools Extra" + echo " clang: Clang" echo " lldb: Clang + lldb" echo " lld: Clang + lld" echo " rt: Clang + compiler-rt" @@ -21,7 +21,6 @@ syntax() { echo " none: Unlink all projects" echo " {+/-}: link / unlink projects (default: link)" echo " c Clang" - echo " x Clang Tools Extra" echo " r Compiler-rt" echo " k lld" echo " d lldb" @@ -35,8 +34,6 @@ syntax() { # Dirs and links into LLVM clang_dir=clang clang_link=tools/clang -clang_extra_dir=clang-tools-extra -clang_extra_link=tools/clang/tools/extra rt_dir=compiler-rt rt_link=projects/compiler-rt libcxx_dir=libcxx @@ -101,7 +98,6 @@ update_build_dirs() { list_all() { echo "Projects linked:" has_link $clang_link && echo " + Clang" - has_link $clang_extra_link && echo " + Clang Tools Extra" has_link $rt_link && echo " + Compiler-RT" has_link $libcxx_link && echo " + LibC++" has_link $libcxxabi_link && echo " + LibC++abi" @@ -115,7 +111,6 @@ list_all() { need_all() { need=$1 clang=$need - clang_extra=$need rt=$need libcxx=$need libcxxabi=$need @@ -135,7 +130,6 @@ fi # Need/not need clang=`init $clang_link` -clang_extra=`init $clang_extra_link` rt=`init $rt_link` libcxx=`init $libcxx_link` libcxxabi=`init $libcxxabi_link` @@ -150,7 +144,6 @@ case $opt in clang) need_all OFF clang=ON - clang_extra=ON shift ;; lldb) @@ -218,9 +211,6 @@ while ! test -z $1; do c) clang=$flag ;; - x) - clang_extra=$flag - ;; r) rt=$flag ;; @@ -249,15 +239,6 @@ while ! test -z $1; do shift done -# clang and clang-tools-extra have a special relationship: we can't enable -# clang-tools-extra without enabling clang, and we also can't disable clang -# without also disabling clang-tools-extra -if [ "$clang_extra" = ON -a "$clang" = OFF ]; then - echo "Can't have Clang Tools Extra without Clang! Try to add +c or -x" - exit -fi - - # Update links update $tests_dir $tests_link $tests update $lldb_dir $lldb_link $lldb @@ -267,7 +248,6 @@ update $libcxxabi_dir $libcxxabi_link $libcxxabi update $libcxx_dir $libcxx_link $libcxx update $rt_dir $rt_link $rt update $clang_dir $clang_link $clang -update $clang_extra_dir $clang_extra_link $clang_extra update_build_dirs -DLLVM_TOOL_LLDB_BUILD=$lldb \ -DLLVM_TOOL_LLD_BUILD=$lld \ -DLLVM_TOOL_LIBUNWIND_BUILD=$libunwind \ @@ -275,5 +255,4 @@ update_build_dirs -DLLVM_TOOL_LLDB_BUILD=$lldb \ -DLLVM_TOOL_LIBCXX_BUILD=$libcxx \ -DLLVM_TOOL_COMPILER_RT_BUILD=$rt \ -DLLVM_TOOL_CLANG_BUILD=$clang \ - -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=$clang_extra list_all |