summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2015-06-08 06:49:55 +0000
committerdsainty <dsainty@pkgsrc.org>2015-06-08 06:49:55 +0000
commit3cfe78ec21846c71881942e2f0cf438bb12de098 (patch)
tree035483643f1468354922fb329f9ba691f790b970 /devel
parentbe4942a8e01bdacd3e11ea183429fd960838a3f8 (diff)
downloadpkgsrc-3cfe78ec21846c71881942e2f0cf438bb12de098.tar.gz
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 (limited to 'devel')
-rw-r--r--devel/binutils/builtin.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index 35f58b16b06..60b54c188b2 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -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 @@ CHECK_BUILTIN.binutils?= no
.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