Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit 9798b27

Browse files
committed
[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
1 parent 6e53164 commit 9798b27

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

autoconf/configure.ac

+5
Original file line numberDiff line numberDiff line change
@@ -2017,6 +2017,11 @@ if test "${clang_src_root}" = ""; then
20172017
clang_src_root="$srcdir/tools/clang"
20182018
fi
20192019
if test -f ${clang_src_root}/README.txt; then
2020+
dnl Clang supports build systems which use the multilib libdir suffix.
2021+
dnl The autoconf system doesn't support this so stub out that variable.
2022+
AC_DEFINE_UNQUOTED(CLANG_LIBDIR_SUFFIX,"",
2023+
[Multilib suffix for libdir.])
2024+
20202025
dnl Use variables to stay under 80 columns.
20212026
configh="include/clang/Config/config.h"
20222027
doxy="docs/doxygen.cfg"

configure

+6
Original file line numberDiff line numberDiff line change
@@ -18458,6 +18458,12 @@ if test "${clang_src_root}" = ""; then
1845818458
clang_src_root="$srcdir/tools/clang"
1845918459
fi
1846018460
if test -f ${clang_src_root}/README.txt; then
18461+
18462+
cat >>confdefs.h <<_ACEOF
18463+
#define CLANG_LIBDIR_SUFFIX ""
18464+
_ACEOF
18465+
18466+
1846118467
configh="include/clang/Config/config.h"
1846218468
doxy="docs/doxygen.cfg"
1846318469
ac_config_headers="$ac_config_headers tools/clang/${configh}:${clang_src_root}/${configh}.in"

include/llvm/Config/config.h.in

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
/* Define if we have libxml2 */
1010
#undef CLANG_HAVE_LIBXML
1111

12+
/* Multilib suffix for libdir. */
13+
#undef CLANG_LIBDIR_SUFFIX
14+
1215
/* Relative directory for resource files */
1316
#undef CLANG_RESOURCE_DIR
1417

0 commit comments

Comments
 (0)