[Git][ghc/ghc][wip/javascript-backend] Source emsdk script before pushd

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/javascript-backend at Glasgow Haskell Compiler / GHC


Commits:
09a435c3 by Sylvain Henry at 2022-11-15T16:54:24+01:00
Source emsdk script before pushd

- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -547,6 +547,11 @@ function make_install_destdir() {
 
 # install the binary distribution in directory $1 to $2.
 function install_bindist() {
+  case "${CONFIGURE_WRAPPER:-}" in
+    emconfigure) source emsdk/emsdk_env.sh ;;
+    *) ;;
+  esac
+
   local bindist="$1"
   local instdir="$2"
   pushd "$bindist"
@@ -564,11 +569,6 @@ function install_bindist() {
           args+=( "--target=$CROSS_TARGET" "--host=$CROSS_TARGET" )
       fi
 
-      case "${CONFIGURE_WRAPPER:-}" in
-        emconfigure) source emsdk/emsdk_env.sh ;;
-        *) ;;
-      esac
-
       run ${CONFIGURE_WRAPPER:-} ./configure \
           --prefix="$instdir" \
           "${args[@]+"${args[@]}"}"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/09a435c30f4c2c3fff51affd15e686983f590a05

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/09a435c30f4c2c3fff51affd15e686983f590a05
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221115/12cc6cc9/attachment-0001.html>