[Git][ghc/ghc][wip/ghc-9.10.2-submodules] darwin: Drop workaround for #20253

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/ghc-9.10.2-submodules at Glasgow Haskell Compiler / GHC


Commits:
2e2464df by Ben Gamari at 2025-02-05T17:03:48-05:00
darwin: Drop workaround for #20253

- - - - -


1 changed file:

- .gitlab/darwin/toolchain.nix


Changes:

=====================================
.gitlab/darwin/toolchain.nix
=====================================
@@ -56,19 +56,6 @@ let
 
     '';
 
-    # N.B. Work around #20253.
-    nativeBuildInputs = [ pkgs.gnused ];
-    postInstallPhase = ''
-      settings="$out/lib/ghc-${version}/settings"
-      sed -i -e "s%\"llc\"%\"${llvm}/bin/llc\"%" $settings
-      sed -i -e "s%\"opt\"%\"${llvm}/bin/opt\"%" $settings
-      sed -i -e "s%\"clang\"%\"/usr/bin/clang\"%" $settings
-      sed -i -e 's%("C compiler command", "")%("C compiler command", "/usr/bin/clang")%' $settings
-      sed -i -e 's%("C compiler flags", "")%("C compiler flags", "--target=${targetTriple}")%' $settings
-      sed -i -e 's%("C++ compiler flags", "")%("C++ compiler flags", "--target=${targetTriple}")%' $settings
-      sed -i -e 's%("C compiler link flags", "")%("C compiler link flags", "--target=${targetTriple}")%' $settings
-    '';
-
     # Sanity check: verify that we can compile hello world.
     doInstallCheck = true;
     installCheckPhase = ''



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2e2464dfa14e9a47c7b5bc88fe2506ebcaf5ab2d
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/20250205/077662ac/attachment-0001.html>