Skip to content

Commit

Permalink
lang/ghc: Use SETENVI for gmake invocations
Browse files Browse the repository at this point in the history
PR:		277492
  • Loading branch information
arrowd committed Mar 9, 2024
1 parent c4fa625 commit 973a7aa
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lang/ghc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ pre-configure:
# If we are using bootstrap compiler, configure and install it into ${BOOT_DIR}
.if empty(PORT_OPTIONS:MBOOT)
cd ${BOOT_DIR} && ${CONFIGURE_CMD} ${CONFIGURE_ENV} --prefix=${BOOT_INSTALL_DIR}
cd ${BOOT_DIR} && ${MAKE_CMD} PACKAGES='' install
cd ${BOOT_DIR} && ${SETENVI} ${WRK_ENV} ${GMAKE} PACKAGES='' install
.endif
.ifdef USE_HADRIAN
# Compile Hadrian
Expand Down Expand Up @@ -273,7 +273,7 @@ create-bootstrap:
&& ${ECHO_CMD} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \
&& ${ECHO_CMD} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \
&& ${ECHO_CMD} "HADDOCK_DOCS=NO" >> mk/build.mk \
&& ${GMAKE} binary-dist TAR_COMP=xz \
&& ${SETENVI} ${WRK_ENV} ${GMAKE} binary-dist TAR_COMP=xz \
&& ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz
.else
cd ${WRKSRC} \
Expand All @@ -292,7 +292,7 @@ create-bootstrap:
create-stack-bindist:
.ifndef USE_HADRIAN
cd ${WRKSRC} \
&& ${GMAKE} binary-dist TAR_COMP=xz \
&& ${SETENVI} ${WRK_ENV} ${GMAKE} binary-dist TAR_COMP=xz \
&& ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/
.else
cd ${WRKSRC} \
Expand Down Expand Up @@ -337,7 +337,7 @@ check-hadrian-bootstrap:
${FALSE}
.endif
# Install bootstrap GHC
${MAKE} -C ${.CURDIR} pre-configure
${MAKE_CMD} -C ${.CURDIR} pre-configure
# Compile Hadrian
cd ${WRKSRC}/hadrian/bootstrap && \
./bootstrap.py -w ${BOOT_GHC} -s /tmp/hadrian-${GHC_VERSION}-boot.tar.gz
Expand Down

0 comments on commit 973a7aa

Please sign in to comment.