Fri Jan 3 11:11:29 2020 UTC ()
Explicitly set the ld command to ${LD}

Without doing this the resulting compiler will have a cwrapper ld
embedded, and will be unable to bootstrap later versions of GHC.


(pho)
diff -r1.38 -r1.39 pkgsrc/lang/ghc7/Makefile
cvs diff -r1.38 -r1.39 pkgsrc/lang/ghc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/Makefile 2019/12/31 07:10:30 1.38
+++ pkgsrc/lang/ghc7/Makefile 2020/01/03 11:11:29 1.39
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.38 2019/12/31 07:10:30 pho Exp $ 1# $NetBSD: Makefile,v 1.39 2020/01/03 11:11:29 pho Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-7.10.3-src 5DISTNAME= ghc-7.10.3-src
6PKGREVISION= 1 6PKGREVISION= 2
7PKGNAME= ${DISTNAME:S/-src$//} 7PKGNAME= ${DISTNAME:S/-src$//}
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 7.10 Release Series 14COMMENT= Compiler for the functional language Haskell - 7.10 Release Series
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
17# TODO: We should be using the alternatives framework. 17# TODO: We should be using the alternatives framework.
18CONFLICTS+= ghc-[0-9]* 18CONFLICTS+= ghc-[0-9]*
19 19
20# GHC requires GHC to build itself. Formerly we could work around this 20# GHC requires GHC to build itself. Formerly we could work around this
21# bootstrapping problem by creating a special archive containing C 21# bootstrapping problem by creating a special archive containing C
22# sources compiled from Haskell sources, but that's no longer 22# sources compiled from Haskell sources, but that's no longer
23# possible. So we have to prepare stripped-down binaries sufficient to 23# possible. So we have to prepare stripped-down binaries sufficient to
24# bootstrap compilers for each platforms. If you want to build them 24# bootstrap compilers for each platforms. If you want to build them
25# yourself, follow instructions in ./bootstrap.mk 25# yourself, follow instructions in BOOTSTRAP.txt and ./bootstrap.mk
26BROKEN_EXCEPT_ON_PLATFORM+= \ 26BROKEN_EXCEPT_ON_PLATFORM+= \
27 Darwin-*-powerpc \ 27 Darwin-*-powerpc \
28 FreeBSD-*-i386 \ 28 FreeBSD-*-i386 \
29 NetBSD-*-x86_64 \ 29 NetBSD-*-x86_64 \
30 SunOS-*-i386 \ 30 SunOS-*-i386 \
31 SunOS-*-x86_64 31 SunOS-*-x86_64
32 32
33 33
34# ----------------------------------------------------------------------------- 34# -----------------------------------------------------------------------------
35# Distfiles 35# Distfiles
36# 36#
37DISTFILES= ${DEFAULT_DISTFILES} 37DISTFILES= ${DEFAULT_DISTFILES}
38WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 38WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
@@ -43,26 +43,27 @@ EXTRACT_ONLY= ${DEFAULT_DISTFILES} @@ -43,26 +43,27 @@ EXTRACT_ONLY= ${DEFAULT_DISTFILES}
43 43
44# ----------------------------------------------------------------------------- 44# -----------------------------------------------------------------------------
45# Tools 45# Tools
46# 46#
47# The runtime dependency on perl is due to the evil splitter 47# The runtime dependency on perl is due to the evil splitter
48# (lib/${PKGNAME_NOREV}/ghc-split). 48# (lib/${PKGNAME_NOREV}/ghc-split).
49USE_TOOLS+= autoconf gmake gzip perl:run 49USE_TOOLS+= autoconf gmake gzip perl:run
50GNU_CONFIGURE= yes 50GNU_CONFIGURE= yes
51USE_GNU_CONFIGURE_HOST= no 51USE_GNU_CONFIGURE_HOST= no
52USE_LIBTOOL= yes 52USE_LIBTOOL= yes
53 53
54CONFIGURE_ARGS.common= \ 54CONFIGURE_ARGS.common= \
55 --with-gcc=${CC:Q} \ 55 --with-gcc=${CC:Q} \
 56 --with-ld=${LD:Q} \
56 --with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.curses:Q} \ 57 --with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.curses:Q} \
57 --with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_LIBDIRS.curses:Q} \ 58 --with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_LIBDIRS.curses:Q} \
58 --with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q} \ 59 --with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q} \
59 --with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q} \ 60 --with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q} \
60 --with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q} \ 61 --with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q} \
61 --with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q} \ 62 --with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q} \
62 --with-system-libffi \ 63 --with-system-libffi \
63 --with-ffi-includes=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_INCDIRS.libffi:Q} \ 64 --with-ffi-includes=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_INCDIRS.libffi:Q} \
64 --with-ffi-libraries=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_LIBDIRS.libffi:Q} 65 --with-ffi-libraries=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_LIBDIRS.libffi:Q}
65 66
66CONFIGURE_ARGS+= ${CONFIGURE_ARGS.common} 67CONFIGURE_ARGS+= ${CONFIGURE_ARGS.common}
67 68
68CONFIGURE_ENV+= \ 69CONFIGURE_ENV+= \