Replace the old --with-cxx-* configure options with a single --with-gcc-toolchain

that just uses the new toolchain probing logic. This fixes linking with -m32 on
64 bit systems (the /32 dir was not being added to the search).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@149651 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2012-02-03 00:59:30 +00:00
parent 871a2051f7
commit 1aee22e072
7 changed files with 45 additions and 189 deletions

View File

@@ -11,17 +11,8 @@
/* Relative directory for resource files */
#define CLANG_RESOURCE_DIR "${CLANG_RESOURCE_DIR}"
/* 32 bit multilib directory. */
#define CXX_INCLUDE_32BIT_DIR "${CXX_INCLUDE_32BIT_DIR}"
/* 64 bit multilib directory. */
#define CXX_INCLUDE_64BIT_DIR "${CXX_INCLUDE_64BIT_DIR}"
/* Arch the libstdc++ headers. */
#define CXX_INCLUDE_ARCH "${CXX_INCLUDE_ARCH}"
/* Directory with the libstdc++ headers. */
#define CXX_INCLUDE_ROOT "${CXX_INCLUDE_ROOT}"
/* Directory wherelibstdc++ is installed. */
#define GCC_INSTALL_PREFIX "${GCC_INSTALL_PREFIX}"
/* Directories clang will search for headers */
#define C_INCLUDE_DIRS "${C_INCLUDE_DIRS}"

View File

@@ -9,18 +9,6 @@
/* Relative directory for resource files */
#undef CLANG_RESOURCE_DIR
/* 32 bit multilib directory. */
#undef CXX_INCLUDE_32BIT_DIR
/* 64 bit multilib directory. */
#undef CXX_INCLUDE_64BIT_DIR
/* Arch the libstdc++ headers. */
#undef CXX_INCLUDE_ARCH
/* Directory with the libstdc++ headers. */
#undef CXX_INCLUDE_ROOT
/* Directories clang will search for headers */
#undef C_INCLUDE_DIRS
@@ -33,6 +21,9 @@
/* Define if timestamp information (e.g., __DATE___) is allowed */
#undef ENABLE_TIMESTAMPS
/* Directory where gcc is installed. */
#undef GCC_INSTALL_PREFIX
/* Define to 1 if you have the `argz_append' function. */
#undef HAVE_ARGZ_APPEND