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 | 23fc6f34c379f5ba20dcb9b07c46b04ec72c0f0a (patch) | |
| tree | 7501c655c500d64401579c8c2375c3e2efd7080a /llvm | |
| parent | c48b9594b63020880151fc6a0d8c480ce740b922 (diff) | |
| download | bcm5719-llvm-23fc6f34c379f5ba20dcb9b07c46b04ec72c0f0a.tar.gz bcm5719-llvm-23fc6f34c379f5ba20dcb9b07c46b04ec72c0f0a.zip | |
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.
llvm-svn: 189026
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/autoconf/configure.ac | 7 | ||||
| -rwxr-xr-x | llvm/configure | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 31edd35792b..993e41ced96 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/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 diff --git a/llvm/configure b/llvm/configure index 739b150938e..d6d62ea3a26 100755 --- a/llvm/configure +++ b/llvm/configure @@ -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 |
