diff options
| author | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-02 00:11:14 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-02 00:11:14 +0000 |
| commit | 2badba5f272f304bde790a5c92fbbb56654006bf (patch) | |
| tree | 1ac255e2de88d0c110151c4003fbf13a3f9bf4aa | |
| parent | c1a6f981440da9876e8681ebeba5de973e9a30ff (diff) | |
| download | llvm-2badba5f272f304bde790a5c92fbbb56654006bf.zip llvm-2badba5f272f304bde790a5c92fbbb56654006bf.tar.gz llvm-2badba5f272f304bde790a5c92fbbb56654006bf.tar.bz2 | |
autoconf: honor --with-clang-srcdir
configure was silently failing to produce anything in the case
where clang wasn't at tools/clang/, resulting in compilation
errors much later in the build when config.h didn't exist.
llvm-svn: 149563
| -rw-r--r-- | llvm/autoconf/configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 84a120b..ad44a63 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -813,7 +813,7 @@ AC_ARG_WITH(clang-srcdir, [Directory to the out-of-tree Clang source]),, withval="-") case "$withval" in - -) clang_src_root="" ;; + -) clang_src_root="$ac_pwd/tools/clang" ;; /* | [[A-Za-z]]:[[\\/]]*) clang_src_root="$withval" ;; *) clang_src_root="$ac_pwd/$withval" ;; esac @@ -1588,9 +1588,9 @@ dnl Configure doxygen's configuration file AC_CONFIG_FILES([docs/doxygen.cfg]) dnl Configure clang, if present -if test -f ${srcdir}/tools/clang/README.txt; then - AC_CONFIG_HEADERS([tools/clang/include/clang/Config/config.h]) - AC_CONFIG_FILES([tools/clang/docs/doxygen.cfg]) +if test -f ${clang_src_root}/README.txt; then + AC_CONFIG_HEADERS([${clang_src_root}/include/clang/Config/config.h]) + AC_CONFIG_FILES([${clang_src_root}/docs/doxygen.cfg]) fi dnl OCaml findlib META file |