summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjperkin <jperkin>2012-07-23 12:47:55 +0000
committerjperkin <jperkin>2012-07-23 12:47:55 +0000
commit63602be919d55e35d6cbf2db435bf083a1b8776c (patch)
treee48bb1f863d1f640007837bf06abfa488ac19bae /lang
parentedb67a4aca196d79f564ac25abde618ca681d1d0 (diff)
downloadpkgsrc-63602be919d55e35d6cbf2db435bf083a1b8776c.tar.gz
Update binutils detection on Solaris to match current reality.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc47/Makefile20
1 files changed, 15 insertions, 5 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 368da67e185..2284202e678 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/07/12 13:47:23 marino Exp $
+# $NetBSD: Makefile,v 1.5 2012/07/23 12:47:55 jperkin Exp $
GCC_PKGNAME= gcc47
.include "version.mk"
@@ -78,13 +78,23 @@ MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
# Determine whether to use binutils
.if ${OPSYS} == "SunOS"
+. if exists(/usr/sfw/bin/gobjdump)
CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
+. endif
+. if exists(/usr/bin/ld)
+CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
+. else
CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
-. if !exists(/usr/sfw/bin/gas)
-CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
-. else
+. endif
+. if exists(/usr/sfw/bin/gas)
CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
-. endif
+. elif exists(/usr/ccs/bin/as)
+CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
+. else
+BUILDLINK_DEPMETHOD.binutils= full
+. include "../../devel/binutils/buildlink3.mk"
+CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/gnu/bin/as
+. endif
.endif
pre-configure: