diff options
| author | riastradh <riastradh@pkgsrc.org> | 2020-03-27 04:13:57 +0000 |
|---|---|---|
| committer | riastradh <riastradh@pkgsrc.org> | 2020-03-27 04:13:57 +0000 |
| commit | bfff350042332caf402757e28c15737b9024938a (patch) | |
| tree | fb514e562f57b4ddabac1e7e2c7e28d3444df201 /lang/ghc7 | |
| parent | 1bc9104e9b6c8f2dc77d777eb2cd10438e0f2d18 (diff) | |
| download | pkgsrc-bfff350042332caf402757e28c15737b9024938a.tar.gz | |
Set LD_LIBRARY_PATH for compat80 emul in configure step too.
Diffstat (limited to 'lang/ghc7')
| -rw-r--r-- | lang/ghc7/Makefile | 4 | ||||
| -rw-r--r-- | lang/ghc7/bootstrap.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile index e19efab6381..fcde6180ada 100644 --- a/lang/ghc7/Makefile +++ b/lang/ghc7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2020/03/08 16:42:27 bsiegert Exp $ +# $NetBSD: Makefile,v 1.43 2020/03/27 04:13:57 riastradh Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -193,7 +193,7 @@ BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compat80 adds # to the /usr tree can't be applied. -MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib .endif .include "../../converters/libiconv/buildlink3.mk" diff --git a/lang/ghc7/bootstrap.mk b/lang/ghc7/bootstrap.mk index 818ad2de9a2..281bfae8de5 100644 --- a/lang/ghc7/bootstrap.mk +++ b/lang/ghc7/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.30 2020/02/14 23:36:54 jperkin Exp $ +# $NetBSD: bootstrap.mk,v 1.31 2020/03/27 04:13:57 riastradh Exp $ # ----------------------------------------------------------------------------- # Select a bindist of bootstrapping compiler on a per-platform basis. # @@ -99,7 +99,7 @@ pre-configure: ${RUN}cd ${WRKDIR:Q}/build-extract/ghc-${BOOT_VERSION}-boot && \ ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${SH} ./configure \ --prefix=${TOOLS_DIR:Q} && \ - ${MAKE_PROGRAM} install + ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install # ----------------------------------------------------------------------------- |