[arch-commits] Commit in llvm/trunk (PKGBUILD clang-pure64.patch)

[Evangelos Foutras]

    Date: Saturday, February 2, 2013 @ 13:44:13
  Author: foutrelis
Revision: 176907

upgpkg: llvm 3.2-5

Drop clang-pure64.patch, similar to GCC. (FS#33671)

Modified:
  llvm/trunk/PKGBUILD
Deleted:
  llvm/trunk/clang-pure64.patch

--------------------+
 PKGBUILD           |    9 +--------
 clang-pure64.patch |   13 -------------
 2 files changed, 1 insertion(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-02 07:15:02 UTC (rev 176906)
+++ PKGBUILD	2013-02-02 12:44:13 UTC (rev 176907)
@@ -11,7 +11,7 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.2
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -22,7 +22,6 @@
         llvm-Config-config.h
         llvm-Config-llvm-config.h
         cindexer-clang-path.patch
-        clang-pure64.patch
         enable-lto.patch
         llvm-3.1-fix-debug-line-info.patch
         clang-3.1-fix-libprofile_rt.a-location.patch)
@@ -32,7 +31,6 @@
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
-            '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
             'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b'
             'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
             '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
@@ -68,11 +66,6 @@
   # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
   patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
 
-  if [[ $CARCH == x86_64 ]]; then
-    # Adjust linker path
-    patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
-  fi
-
   # Make -flto work
   # Use gold instead of default linker, and always use the plugin
   patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"

Deleted: clang-pure64.patch
===================================================================
--- clang-pure64.patch	2013-02-02 07:15:02 UTC (rev 176906)
+++ clang-pure64.patch	2013-02-02 12:44:13 UTC (rev 176907)
@@ -1,13 +0,0 @@
-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::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");