diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-31 13:45:10 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-31 13:45:10 -0300 |
| commit | 97a832ff546d30bb6eec34f23fd94aecab9ac738 (patch) | |
| tree | 90bbef126bf86efce995dfa00dadd9707baa8222 /testing/llvm/clang-pure64.patch | |
| parent | 9879fa51372849ca7b637a1c22010584ca552274 (diff) | |
| parent | f935ebf41c626e4832f86c5f3f7ed1cc35128f6b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/egoboo/PKGBUILD
extra/gnutls/PKGBUILD
extra/kdelibs/PKGBUILD
extra/maxima/PKGBUILD
extra/phonon/PKGBUILD
extra/rest/PKGBUILD
extra/ristretto/PKGBUILD
extra/samba/PKGBUILD
extra/sbcl/PKGBUILD
extra/xfce4-clipman-plugin/PKGBUILD
extra/xfce4-notifyd/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'testing/llvm/clang-pure64.patch')
| -rw-r--r-- | testing/llvm/clang-pure64.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/testing/llvm/clang-pure64.patch @@ -0,0 +1,38 @@ +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3306,7 +3306,7 @@ + else if (ToolChain.getArch() == llvm::Triple::arm) + CmdArgs.push_back("/lib/ld-linux.so.3"); + else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); ++ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1317,18 +1317,10 @@ + if (Arch == llvm::Triple::x86) + Suffix64 = "/64"; + +- std::string Lib32 = "lib"; +- +- bool Exists; +- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) +- Lib32 = "lib32"; +- ++ std::string Lib32 = "lib32"; + std::string Lib64 = "lib"; +- bool Symlink; +- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && +- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) +- Lib64 = "lib64"; + ++ bool Exists; + std::string GccTriple = ""; + if (Arch == llvm::Triple::arm) { + if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && |