[pkgsrc/trunk]: pkgsrc/devel/binutils Fix override-as.mk by fixing the path i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6687975e19c8
branches:  trunk
changeset: 652793:6687975e19c8
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Mon Jun 08 06:49:55 2015 +0000

description:
Fix override-as.mk by fixing the path in AS.

This rarely seems to be a problem, but is exposed by building mplayer on a
32-bit x86 platform with USE_CWRAPPERS=yes.  Possibly with Linux tie-ins, my
NetBSD platforms are all 64 bit.

In the failing scenario mplayer attempts (at least at configure time) to use
"as" directly.  This is wrapped by cwrappers, which attempts to execute $AS
explicitly.

The exec fails because $PREFIX/bin/as doesn't exist, and hasn't done for a
long time.

Correct all the tool paths to include the "g" prefix for all these tools.

diffstat:

 devel/binutils/builtin.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (26 lines):

diff -r aab6d226a5c8 -r 6687975e19c8 devel/binutils/builtin.mk
--- a/devel/binutils/builtin.mk Mon Jun 08 06:29:20 2015 +0000
+++ b/devel/binutils/builtin.mk Mon Jun 08 06:49:55 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2014/09/10 10:39:35 richard Exp $
+# $NetBSD: builtin.mk,v 1.9 2015/06/08 06:49:55 dsainty Exp $
 
 BINUTILS_PREFIX?=      /usr
 
@@ -71,11 +71,11 @@
 .if !empty(CHECK_BUILTIN.binutils:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.binutils:M[nN][oO])
-AR=    ${BUILDLINK_PREFIX.binutils}/bin/ar
-AS=    ${BUILDLINK_PREFIX.binutils}/bin/as
-LD=    ${BUILDLINK_PREFIX.binutils}/bin/ld
-NM=    ${BUILDLINK_PREFIX.binutils}/bin/nm
-RANLIB=        ${BUILDLINK_PREFIX.binutils}/bin/ranlib
+AR=    ${BUILDLINK_PREFIX.binutils}/bin/gar
+AS=    ${BUILDLINK_PREFIX.binutils}/bin/gas
+LD=    ${BUILDLINK_PREFIX.binutils}/bin/gld
+NM=    ${BUILDLINK_PREFIX.binutils}/bin/gnm
+RANLIB=        ${BUILDLINK_PREFIX.binutils}/bin/granlib
 .  endif
 
 .endif # CHECK_BUILTIN.binutils