Skip to content

[Backport release-25.05] haskell.compiler.ghc94: don't roundtrip C compilation via assembly #411716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfgangwalther merged 4 commits into from
Jul 1, 2025
Merged

[Backport release-25.05] haskell.compiler.ghc94: don't roundtrip C compilation via assembly #411716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1423e03
haskell.compiler.ghc*Binary: detect -lnuma based on library list
sternenseemann May 27, 2025
b574f0d
haskell.compiler.ghc902Binary: init at 9.0.2
sternenseemann May 27, 2025
b4428e4
haskell.compiler.ghc94: bootstrap from 9.0.2 bindist
sternenseemann May 27, 2025
5ebbed3
haskell.compiler.ghc94: don't roundtrip C compilation via assembly
sternenseemann May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions pkgs/development/compilers/ghc/8.10.7-binary.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,17 @@ stdenv.mkDerivation {
-exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
''
+
# aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
# Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
# FFI_LIB_DIR is a good indication of places it must be needed.
lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
find . -name package.conf.in \
-exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
''
lib.optionalString
(
lib.meta.availableOn stdenv.hostPlatform numactl
&& builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
)
''
find . -name package.conf.in \
-exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
''
+
# Rename needed libraries and binaries, fix interpreter
lib.optionalString stdenv.hostPlatform.isLinux ''
Expand Down
Loading