diff options
| author | pho <pho@pkgsrc.org> | 2015-02-20 19:10:29 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2015-02-20 19:10:29 +0000 |
| commit | f3f666b06f8f7bdfa1b92b26ba63fcad536b4b3e (patch) | |
| tree | b013beccc452fde6582076e29a9be23404bbfc5c /lang/ghc7 | |
| parent | 438ee4b7398ad33da2600e69a5b3d9148ffc7f88 (diff) | |
| download | pkgsrc-f3f666b06f8f7bdfa1b92b26ba63fcad536b4b3e.tar.gz | |
Leave CONF_LD_LINKER_OPTS_STAGE{0,1,2} undefined
These flags are only used for creating static GHCi libraries
(HS*.o). Setting them to ${LDFLAGS} does more harm than good because
our ${LDFLAGS} contains -Wl,* flags. It's true that
../../mk/wrapper/cmd-sink-ld transforms them but those flags will also
be baked into the compiler (see ${WRKSRC}/compiler/ghc.mk) so they
cause problems when used outside the buildlink.
Diffstat (limited to 'lang/ghc7')
| -rw-r--r-- | lang/ghc7/Makefile | 14 | ||||
| -rw-r--r-- | lang/ghc7/buildlink3.mk | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile index 4466dcff422..84a80c4f154 100644 --- a/lang/ghc7/Makefile +++ b/lang/ghc7/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2015/02/17 09:29:17 pho Exp $ +# $NetBSD: Makefile,v 1.19 2015/02/20 19:10:29 pho Exp $ # ----------------------------------------------------------------------------- # Package metadata # DISTNAME= ghc-7.6.3-src PKGNAME= ${DISTNAME:S/-src$//} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= lang MASTER_SITES= http://www.haskell.org/ghc/dist/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.bz2 @@ -67,8 +67,14 @@ CONFIGURE_ENV+= \ .for stage in 0 1 2 CONFIGURE_ENV+= \ CONF_CC_OPTS_STAGE${stage}=${CFLAGS:Q} \ - CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:Q} \ - CONF_LD_LINKER_OPTS_STAGE${stage}=${LDFLAGS:Q} + CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:Q} +# Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for +# creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS} +# does more harm than good because our ${LDFLAGS} contains -Wl,* +# flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them +# but those flags will also be baked into the compiler (see +# ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside +# the buildlink. .endfor diff --git a/lang/ghc7/buildlink3.mk b/lang/ghc7/buildlink3.mk index 41a3c9ef5eb..84afc4af6f3 100644 --- a/lang/ghc7/buildlink3.mk +++ b/lang/ghc7/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2015/02/13 19:28:40 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2015/02/20 19:10:29 pho Exp $ BUILDLINK_TREE+= ghc @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ghc GHC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ghc+= ghc>=7.6.3 -BUILDLINK_ABI_DEPENDS.ghc+= ghc>=7.6.3nb5 +BUILDLINK_ABI_DEPENDS.ghc+= ghc>=7.6.3nb6 BUILDLINK_PKGSRCDIR.ghc?= ../../lang/ghc7 # On FreeBSD we need pkgsrc libiconv. See bootstrap.mk for details. |