diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-02-03 00:59:30 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-02-03 00:59:30 +0000 |
| commit | 1aee22e0720932a82dd3bf3fc8be804fff6bb89a (patch) | |
| tree | 38dad0e5120cf2ed64a699a2ba869c6c9f98e3a7 /utils/llvm-compilers-check | |
| parent | 871a2051f7d49827259d719a97b8cc86163edbd9 (diff) | |
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
Diffstat (limited to 'utils/llvm-compilers-check')
| -rwxr-xr-x | utils/llvm-compilers-check | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/utils/llvm-compilers-check b/utils/llvm-compilers-check index f7eecfc86b5..623ebc6a32c 100755 --- a/utils/llvm-compilers-check +++ b/utils/llvm-compilers-check @@ -347,28 +347,26 @@ class Builder(threading.Thread): # Assume we're building with gcc for now. cxxincludes = self.get_includes() - cxxroot = cxxincludes[0] - cxxarch = os.path.basename(cxxincludes[1]) + cxxroot = os.path.dirname(cxxincludes[0]) # Remove the version + cxxroot = os.path.dirname(cxxroot) # Remove the c++ + cxxroot = os.path.dirname(cxxroot) # Remove the include configure_flags = dict( llvm=dict(debug=["--prefix=" + self.install_prefix, "--with-extra-options=-Werror", "--enable-assertions", "--disable-optimized", - "--with-cxx-include-root=" + cxxroot, - "--with-cxx-include-arch=" + cxxarch], + "--with-gcc-toolchain=" + cxxroot], release=["--prefix=" + self.install_prefix, "--with-extra-options=-Werror", "--enable-optimized", - "--with-cxx-include-root=" + cxxroot, - "--with-cxx-include-arch=" + cxxarch], + "--with-gcc-toolchain=" + cxxroot], paranoid=["--prefix=" + self.install_prefix, "--with-extra-options=-Werror", "--enable-assertions", "--enable-expensive-checks", "--disable-optimized", - "--with-cxx-include-root=" + cxxroot, - "--with-cxx-include-arch=" + cxxarch]), + "--with-gcc-toolchain=" + cxxroot]), dragonegg=dict(debug=[], release=[], paranoid=[])) |