From d6974d6f288620b6a0f23493c70d159fd2e15b0d Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 12 Jun 2024 10:40:38 +0100 Subject: [PATCH 1/2] Bump index state This is an attempt to isolate changes from https://github.com/haskell/haskell-language-server/pull/4233 in order to reproduce the mac build failure. --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index faa94671f8..d33e73eb41 100644 --- a/cabal.project +++ b/cabal.project @@ -7,7 +7,7 @@ packages: ./hls-plugin-api ./hls-test-utils -index-state: 2024-06-07T00:00:00Z +index-state: 2024-06-10T12:08:58Z tests: True test-show-details: direct From 958b8073d6614b53a32bb2e3d4e8e2f5a277f997 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Thu, 13 Jun 2024 11:27:21 +0100 Subject: [PATCH 2/2] Try setting some linker flags for macos --- haskell-language-server.cabal | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index a28467e634..0902f35fc4 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -1486,6 +1486,9 @@ test-suite hls-fourmolu-plugin-tests type: exitcode-stdio-1.0 hs-source-dirs: plugins/hls-fourmolu-plugin/test main-is: Main.hs + -- Work around https://gitlab.haskell.org/ghc/ghc/-/issues/24648 + if os(darwin) + ghc-options: -optl-Wl,-ld_classic build-tool-depends: fourmolu:fourmolu build-depends: @@ -1539,6 +1542,9 @@ test-suite hls-ormolu-plugin-tests type: exitcode-stdio-1.0 hs-source-dirs: plugins/hls-ormolu-plugin/test main-is: Main.hs + -- Work around https://gitlab.haskell.org/ghc/ghc/-/issues/24648 + if os(darwin) + ghc-options: -optl-Wl,-ld_classic build-tool-depends: ormolu:ormolu build-depends: