diff options
| author | Jordan Rose <jordan_rose@apple.com> | 2013-08-22 15:49:53 +0000 |
|---|---|---|
| committer | Jordan Rose <jordan_rose@apple.com> | 2013-08-22 15:49:53 +0000 |
| commit | 3e7f1a990193287ac0aee63e84f9ee0d29e6b16b (patch) | |
| tree | bae1ec551c68db8a95b1cae6660a63e977b59ab4 | |
| parent | 35eab1db2f21aee9678fe946a5d983a67285e7e4 (diff) | |
| download | external_llvm-3e7f1a990193287ac0aee63e84f9ee0d29e6b16b.zip external_llvm-3e7f1a990193287ac0aee63e84f9ee0d29e6b16b.tar.gz external_llvm-3e7f1a990193287ac0aee63e84f9ee0d29e6b16b.tar.bz2 | |
Autoconf: The Clang ARC migrator now depends on the static analyzer.
I don't actually have a version of autoconf so I edited configure directly
as well. It's copy-pasted so I think there was little margin for error.
See also Clang-side dependency graph changes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189026 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | autoconf/configure.ac | 7 | ||||
| -rwxr-xr-x | configure | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 31edd35..993e41c 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -551,7 +551,12 @@ AC_ARG_ENABLE(clang-static-analyzer, enableval="yes") case "$enableval" in yes) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[1]) ;; - no) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[0]) ;; + no) + if test ${clang_arcmt} != "no" ; then + AC_MSG_ERROR([Cannot enable clang ARC Migration Tool while disabling static analyzer.]) + fi + AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[0]) + ;; default) AC_SUBST(ENABLE_CLANG_STATIC_ANALYZER,[1]);; *) AC_MSG_ERROR([Invalid setting for --enable-clang-static-analyzer. Use "yes" or "no"]) ;; esac @@ -5224,8 +5224,14 @@ fi case "$enableval" in yes) ENABLE_CLANG_STATIC_ANALYZER=1 ;; - no) ENABLE_CLANG_STATIC_ANALYZER=0 - ;; + no) + if test ${clang_arcmt} != "no" ; then + { { echo "$as_me:$LINENO: error: Cannot enable clang ARC Migration Tool while disabling static analyzer." >&5 +echo "$as_me: error: Cannot enable clang ARC Migration Tool while disabling static analyzer." >&2;} + { (exit 1); exit 1; }; } + fi + ENABLE_CLANG_STATIC_ANALYZER=0 + ;; default) ENABLE_CLANG_STATIC_ANALYZER=1 ;; *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-clang-static-analyzer. Use \"yes\" or \"no\"" >&5 |