[pkgsrc/trunk]: pkgsrc/lang revert previous hack, it doesn't work due to -lgcc.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91d6e397a3e1
branches:  trunk
changeset: 650684:91d6e397a3e1
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Apr 25 22:06:42 2015 +0000

description:
revert previous hack, it doesn't work due to -lgcc.
Will fix it in wrappers instead.

diffstat:

 lang/libLLVM/Makefile   |  17 +----------------
 lang/libLLVM34/Makefile |  17 +----------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diffs (60 lines):

diff -r 68c3ddcebcda -r 91d6e397a3e1 lang/libLLVM/Makefile
--- a/lang/libLLVM/Makefile     Sat Apr 25 22:06:34 2015 +0000
+++ b/lang/libLLVM/Makefile     Sat Apr 25 22:06:42 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/25 20:20:32 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/25 22:06:42 tnn Exp $
 
 PKGNAME=               ${DISTNAME:S/clang/libLLVM/}
 PKGREVISION=           1
@@ -33,19 +33,4 @@
 
 INSTALLATION_DIRS+=    lib/libLLVM
 
-# XXX temporary band-aid for wrapper reordering bug until we have a proper fix
-#
-# Wrappers incorrectly reorder:
-#
-# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive
-#
-# to
-#
-# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib
-#
-# Which nullies the effect of --whole-archive.
-# Kludge around this by removing --no-whole-archive from the command line.
-# It happens to be safe in this particular case, as far as I can tell.
-BUILDLINK_TRANSFORM+=  rm:-Wl,--no-whole-archive
-
 .include "../../lang/clang/Makefile.common"
diff -r 68c3ddcebcda -r 91d6e397a3e1 lang/libLLVM34/Makefile
--- a/lang/libLLVM34/Makefile   Sat Apr 25 22:06:34 2015 +0000
+++ b/lang/libLLVM34/Makefile   Sat Apr 25 22:06:42 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/04/25 20:20:32 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2015/04/25 22:06:42 tnn Exp $
 
 DISTNAME=      llvm-${PKGVERSION_NOREV}.src
 PKGNAME=       libLLVM34-3.4.2
@@ -75,21 +75,6 @@
 PLIST_SUBST+=          SOEXT="so"
 .endif
 
-# XXX temporary band-aid for wrapper reordering bug until we have a proper fix
-#
-# Wrappers incorrectly reorder:
-#
-# -Wl,--whole-archive -lmystaticlib -Wl,--no-whole-archive
-#
-# to
-#
-# -Wl,--whole-archive -Wl,--no-whole-archive -lmystaticlib
-#
-# Which nullies the effect of --whole-archive.
-# Kludge around this by removing --no-whole-archive from the command line.
-# It happens to be safe in this particular case, as far as I can tell.
-BUILDLINK_TRANSFORM+=  rm:-Wl,--no-whole-archive
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"