Set LD_LIBRARY_PATH for compat80 emul in configure step too.

6 files changed, 12 insertions, 12 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
 
 
 # -----------------------------------------------------------------------------
diff --git a/lang/ghc80/Makefile b/lang/ghc80/Makefile
index d4318ffb211..a98631ba42c 100644
--- a/lang/ghc80/Makefile
+++ b/lang/ghc80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/03/08 16:42:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -191,7 +191,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/ghc80/bootstrap.mk b/lang/ghc80/bootstrap.mk
index 0b2de478d6e..7449ddc1f99 100644
--- a/lang/ghc80/bootstrap.mk
+++ b/lang/ghc80/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.4 2020/02/17 17:22:43 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.5 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
 
 
 # -----------------------------------------------------------------------------
diff --git a/lang/ghc84/Makefile b/lang/ghc84/Makefile
index 65d55bb5008..c04ebd6ffc7 100644
--- a/lang/ghc84/Makefile
+++ b/lang/ghc84/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/03/08 16:42:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -209,7 +209,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}/emul/netbsd/usr/lib
+ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/lang/ghc84/bootstrap.mk b/lang/ghc84/bootstrap.mk
index 3da4bdd83f1..479252c06dc 100644
--- a/lang/ghc84/bootstrap.mk
+++ b/lang/ghc84/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.5 2020/02/17 17:24:06 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.6 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -111,7 +111,7 @@ pre-configure:
 	${RUN}cd ${WRKDIR}/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
 
 
 # -----------------------------------------------------------------------------