Two fixes to multi repl command (backport #10017) (#10085)
* Add extra ghc options to multi-repl file These options are configured into the program by Cabal, so we also need to extract these and put them into the mutli-file. Fixes #10015 (cherry picked from commit 539cb7bc) * Fix rendering of `-j` option in multi-repl Before this was rendered as.. ``` /run/current-system/sw/bin/ghc --interactive -package-env - -j 'NumJobs (Just 8)' ... ``` Due to this place not being updated when support for semaphores was added. (cherry picked from commit c3708d21) --------- Co-authored-by:Matthew Pickering <matthewtpickering@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Showing
- Cabal/src/Distribution/Simple/GHC/Build/Link.hs 3 additions, 1 deletionCabal/src/Distribution/Simple/GHC/Build/Link.hs
- cabal-install/src/Distribution/Client/CmdRepl.hs 6 additions, 1 deletioncabal-install/src/Distribution/Client/CmdRepl.hs
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/CHANGELOG.md 5 additions, 0 deletions...estsuite/PackageTests/MultiRepl/ExtraOptions/CHANGELOG.md
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/LICENSE 30 additions, 0 deletionscabal-testsuite/PackageTests/MultiRepl/ExtraOptions/LICENSE
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/app/Main.hs 10 additions, 0 deletions...testsuite/PackageTests/MultiRepl/ExtraOptions/app/Main.hs
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.out 13 additions, 0 deletions...l-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.out
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.project 6 additions, 0 deletions...stsuite/PackageTests/MultiRepl/ExtraOptions/cabal.project
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/cabal.test.hs 6 additions, 0 deletions...stsuite/PackageTests/MultiRepl/ExtraOptions/cabal.test.hs
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/extra-options.cabal 39 additions, 0 deletions...e/PackageTests/MultiRepl/ExtraOptions/extra-options.cabal
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/src/MyLib.hs 6 additions, 0 deletions...estsuite/PackageTests/MultiRepl/ExtraOptions/src/MyLib.hs
- cabal-testsuite/PackageTests/MultiRepl/ExtraOptions/test/Main.hs 6 additions, 0 deletions...estsuite/PackageTests/MultiRepl/ExtraOptions/test/Main.hs
Loading
Please register or sign in to comment