diff options
| -rw-r--r-- | llvm/autoconf/configure.ac | 5 | ||||
| -rwxr-xr-x | llvm/configure | 6 | ||||
| -rw-r--r-- | llvm/include/llvm/Config/config.h.in | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index c998dd5bc7d..9cc4efe3b12 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -2017,6 +2017,11 @@ if test "${clang_src_root}" = ""; then clang_src_root="$srcdir/tools/clang" fi if test -f ${clang_src_root}/README.txt; then + dnl Clang supports build systems which use the multilib libdir suffix. + dnl The autoconf system doesn't support this so stub out that variable. + AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX,"", + [Multilib suffix for libdir.]) + dnl Use variables to stay under 80 columns. configh="include/clang/Config/config.h" doxy="docs/doxygen.cfg" diff --git a/llvm/configure b/llvm/configure index b8cb1e22328..67eac551d5a 100755 --- a/llvm/configure +++ b/llvm/configure @@ -18458,6 +18458,12 @@ if test "${clang_src_root}" = ""; then clang_src_root="$srcdir/tools/clang" fi if test -f ${clang_src_root}/README.txt; then + +cat >>confdefs.h <<_ACEOF +#define CLANG_LIBDIR_SUFFIX "" +_ACEOF + + configh="include/clang/Config/config.h" doxy="docs/doxygen.cfg" ac_config_headers="$ac_config_headers tools/clang/${configh}:${clang_src_root}/${configh}.in" diff --git a/llvm/include/llvm/Config/config.h.in b/llvm/include/llvm/Config/config.h.in index 8fcf14548f8..ec09c84c5b7 100644 --- a/llvm/include/llvm/Config/config.h.in +++ b/llvm/include/llvm/Config/config.h.in @@ -9,6 +9,9 @@ /* Define if we have libxml2 */ #undef CLANG_HAVE_LIBXML +/* Multilib suffix for libdir. */ +#undef CLANG_LIBDIR_SUFFIX + /* Relative directory for resource files */ #undef CLANG_RESOURCE_DIR |
