[multilib] Add support to the autoconf build to substitute

a CLANG_LIBDIR_SUFFIX variable. This is necessary before I can add
support for using that variable to CMake and the C++ code in Clang, and
the autoconf build system does all substitutions in the LLVM tree.

As mentioned before, I'm not planning to add actual multilib support to
the autoconf build, just enough stubs for it to keep playing nicely with
the CMake build once that one has support.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224922 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index c998dd5bc7ddac1b1da356df32db7f8440d95b62..9cc4efe3b1215090536806a0250ff7ec4e4f4fdc 100644 (file)
--- a/autoconf/configure.ac
+++ b/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
   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"
   dnl Use variables to stay under 80 columns.
   configh="include/clang/Config/config.h"
   doxy="docs/doxygen.cfg"

diff --git a/configure b/configure
index b8cb1e223280617f751395fc3fb0aa08f65da085..67eac551d5a788c4a68e5e710ad554158ca13b6d 100755 (executable)
--- a/configure
+++ b/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
   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"
     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/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index 8fcf14548f81f4f87495925939d32b181d7e1f9b..ec09c84c5b71007396a8acee30b22c67c9e59d78 100644 (file)
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -9,6 +9,9 @@
 /* Define if we have libxml2 */
 #undef CLANG_HAVE_LIBXML
 
 /* 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
 
 /* Relative directory for resource files */
 #undef CLANG_RESOURCE_DIR