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 | ec217f6ad66e681b29186f95b8f971d59adf3cbb (patch) | |
| tree | d7bbb31975dd1ebac21d697ce8f4bf1395228fd4 /llvm/utils | |
| parent | 1df8cdc58876ac3beb14bfa3b3736ecbe87b8b59 (diff) | |
| download | bcm5719-llvm-ec217f6ad66e681b29186f95b8f971d59adf3cbb.tar.gz bcm5719-llvm-ec217f6ad66e681b29186f95b8f971d59adf3cbb.zip | |
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).
llvm-svn: 149651
Diffstat (limited to 'llvm/utils')
| -rwxr-xr-x | llvm/utils/llvm-compilers-check | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/llvm/utils/llvm-compilers-check b/llvm/utils/llvm-compilers-check index f7eecfc86b5..623ebc6a32c 100755 --- a/llvm/utils/llvm-compilers-check +++ b/llvm/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=[])) |
