diff options
author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-19 12:44:24 -0500 |
commit | 071445e6a2bb31ddf638e6f2e5362953b47e72dc (patch) | |
tree | 9ec266d72aaa5971dee2d1abbe2de511d971de87 /multilib-testing/lib32-llvm/clang-pure64.patch | |
parent | c14218d562c03601d6d23666f77ed0c2f0025c1b (diff) | |
parent | b8ea4461e461f0e1782e28b5810eb811423afa79 (diff) |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el into pre
Conflicts:
core/heimdal/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/bs/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libx86/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/vbetool/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
Diffstat (limited to 'multilib-testing/lib32-llvm/clang-pure64.patch')
-rw-r--r-- | multilib-testing/lib32-llvm/clang-pure64.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/multilib-testing/lib32-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) && |