diff options
| author | root <root@rshg054.dnsready.net> | 2011-12-20 23:14:59 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-12-20 23:14:59 +0000 |
| commit | ea1f4bece8870857691a7123bdc899562760b3fe (patch) | |
| tree | b332a0692c3e63d46cb60cb1214fc57871e619c8 /multilib/lib32-llvm/clang-pure64.patch | |
| parent | 6d2dec5c3443d142a0131c43666929490961c16a (diff) | |
Tue Dec 20 23:14:59 UTC 2011
Diffstat (limited to 'multilib/lib32-llvm/clang-pure64.patch')
| -rw-r--r-- | multilib/lib32-llvm/clang-pure64.patch | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/multilib/lib32-llvm/clang-pure64.patch b/multilib/lib32-llvm/clang-pure64.patch index da6178519..9bbbfaa8b 100644 --- a/multilib/lib32-llvm/clang-pure64.patch +++ b/multilib/lib32-llvm/clang-pure64.patch @@ -3,36 +3,11 @@ 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 if (ToolChain.getArch() == llvm::Triple::ppc64) + CmdArgs.push_back("/lib64/ld64.so.1"); 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) && |