[Git][ghc/ghc][wip/bashed] Handle unset value in -e context

[Bryan R (@chreekat)]

Bryan R pushed to branch wip/bashed at Glasgow Haskell Compiler / GHC


Commits:
b359cf1c by Bryan Richter at 2023-06-27T14:51:31+03:00
Handle unset value in -e context

- - - - -


1 changed file:

- .gitlab/darwin/toolchain.nix


Changes:

=====================================
.gitlab/darwin/toolchain.nix
=====================================
@@ -113,6 +113,8 @@ pkgs.writeTextFile {
     export CABAL="$CABAL_INSTALL"
 
     sdk_path="$(xcrun --sdk macosx --show-sdk-path)"
-    export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi --build=${targetTriple}"
+    : ''${CONFIGURE_ARGS:=}
+    CONFIGURE_ARGS+="''${CONFIGURE_ARGS:+ }--with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi --build=${targetTriple}"
+    export CONFIGURE_ARGS
   '';
 }



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b359cf1cc85efddc1277e23f7636b6158b20c735
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/20230627/6b7e3181/attachment.html>