6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-24 13:18:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
projects/sample/autoconf/configure.ac
+8 -26
View File
@@ -745,33 +745,15 @@ AC_ARG_WITH(c-include-dirs,
AC_DEFINE_UNQUOTED(C_INCLUDE_DIRS,"$withval",
[Directories clang will search for headers])
AC_ARG_WITH(cxx-include-root,
AS_HELP_STRING([--with-cxx-include-root],
[Directory with the libstdc++ headers.]),,
# Clang normally uses the system c++ headers and libraries. With this option,
# clang will use the ones provided by a gcc installation instead. This option should
# be passed the same value that was used with --prefix when configuring gcc.
AC_ARG_WITH(gcc-toolchain,
AS_HELP_STRING([--with-gcc-toolchain],
[Directory where gcc is installed.]),,
withval="")
AC_DEFINE_UNQUOTED(CXX_INCLUDE_ROOT,"$withval",
[Directory with the libstdc++ headers.])
AC_ARG_WITH(cxx-include-arch,
AS_HELP_STRING([--with-cxx-include-arch],
[Architecture of the libstdc++ headers.]),,
withval="")
AC_DEFINE_UNQUOTED(CXX_INCLUDE_ARCH,"$withval",
[Arch the libstdc++ headers.])
AC_ARG_WITH(cxx-include-32bit-dir,
AS_HELP_STRING([--with-cxx-include-32bit-dir],
[32 bit multilib dir.]),,
withval="")
AC_DEFINE_UNQUOTED(CXX_INCLUDE_32BIT_DIR,"$withval",
[32 bit multilib directory.])
AC_ARG_WITH(cxx-include-64bit-dir,
AS_HELP_STRING([--with-cxx-include-64bit-dir],
[64 bit multilib directory.]),,
withval="")
AC_DEFINE_UNQUOTED(CXX_INCLUDE_64BIT_DIR,"$withval",
[64 bit multilib directory.])
AC_DEFINE_UNQUOTED(GCC_INSTALL_PREFIX,"$withval",
[Directory where gcc is installed.])
dnl Allow linking of LLVM with GPLv3 binutils code.
AC_ARG_WITH(binutils-include,