[pkgsrc/trunk]: pkgsrc/lang Fix building on macOS: disable multilib (it requi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a68ad0cacc96
branches:  trunk
changeset: 357675:a68ad0cacc96
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jan 25 15:17:41 2017 +0000

description:
Fix building on macOS: disable multilib (it requires fat-binaries); now builds without Command Line Tools.

diffstat:

 lang/gcc5/Makefile |  7 ++++++-
 lang/gcc6/Makefile |  7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 48ac857c1e95 -r a68ad0cacc96 lang/gcc5/Makefile
--- a/lang/gcc5/Makefile        Wed Jan 25 14:52:40 2017 +0000
+++ b/lang/gcc5/Makefile        Wed Jan 25 15:17:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/09/08 09:55:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/25 15:17:41 adam Exp $
 
 GCC_PKGNAME=           gcc5
 PKGREVISION=           2
@@ -91,6 +91,11 @@
 CONFIGURE_ARGS+=       --enable-threads=posix
 CONFIGURE_ARGS+=       --with-boot-ldflags=${BOOT_LDFLAGS:Q}
 
+# multilib on Darwin requires fat-binaries
+CONFIGURE_ARGS.Darwin+=        --disable-multilib
+.if !empty(OSX_SDK_PATH)
+CONFIGURE_ARGS.Darwin+=        --with-sysroot=${OSX_SDK_PATH}
+.endif
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-ld --with-ld=/usr/bin/ld
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-as --with-as=/usr/bin/as
 MAKE_ENV.NetBSD+=      ac_cv_func_clock_gettime=yes
diff -r 48ac857c1e95 -r a68ad0cacc96 lang/gcc6/Makefile
--- a/lang/gcc6/Makefile        Wed Jan 25 14:52:40 2017 +0000
+++ b/lang/gcc6/Makefile        Wed Jan 25 15:17:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/12 22:13:54 maya Exp $
+# $NetBSD: Makefile,v 1.2 2017/01/25 15:17:41 adam Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -90,6 +90,11 @@
 CONFIGURE_ARGS+=       --enable-threads=posix
 CONFIGURE_ARGS+=       --with-boot-ldflags=${BOOT_LDFLAGS:Q}
 
+# multilib on Darwin requires fat-binaries
+CONFIGURE_ARGS.Darwin+=        --disable-multilib
+.if !empty(OSX_SDK_PATH)
+CONFIGURE_ARGS.Darwin+=        --with-sysroot=${OSX_SDK_PATH}
+.endif
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-ld --with-ld=/usr/bin/ld
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-as --with-as=/usr/bin/as
 MAKE_ENV.NetBSD+=      ac_cv_func_clock_gettime=yes