[Git][ghc/ghc][wip/js-staging] Try to source emscripten correctly

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
fc3b7466 by Sylvain Henry at 2022-11-07T13:46:06+01:00
Try to source emscripten correctly

- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -376,7 +376,6 @@ function setup_emscripten() {
   cd emsdk
   ./emsdk install latest
   ./emsdk activate latest
-  source ./emsdk_env.sh
   cd ..
 }
 
@@ -417,6 +416,11 @@ EOF
 }
 
 function configure() {
+  case $CONFIGURE_WRAPPER in
+    emconfigure) source emsdk/emsdk_env.sh ;;
+    *) ;;
+  esac
+
   if [[ -z "${NO_BOOT:-}" ]]; then
     start_section "booting"
     run python3 boot



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/fc3b74668f886592855f5416cca0124d1a30b5fc
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/20221107/737c4971/attachment-0001.html>