Skip to content

Fix missing -lnuma when linking musl test exes #652

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.

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
merged 4 commits into from
Jun 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions builder/comp-builder.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{ stdenv, buildPackages, ghc, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, ghcForComponent, hsPkgs, runCommand, libffi, gmp, zlib, ncurses, nodejs }:

{ stdenv, buildPackages, ghc, lib, gobject-introspection ? null, haskellLib, makeConfigFiles, ghcForComponent, hsPkgs, runCommand, libffi, gmp, zlib, ncurses, numactl, nodejs }:
let
# These are here to avoid multiple calls to override
gmpStatic = gmp.override { withStatic = true; };
zlibStatic = zlib.static;
ncursesStatic = ncurses.override { enableStatic = true; };
numactlStatic = numactl.overrideAttrs (_: { configureFlags = "--enable-static"; });
in
lib.makeOverridable (
let self =
{ componentId
Expand Down Expand Up @@ -120,9 +126,10 @@ let
"--disable-executable-dynamic"
"--ghc-option=-optl=-pthread"
"--ghc-option=-optl=-static"
"--ghc-option=-optl=-L${gmp.override { withStatic = true; }}/lib"
"--ghc-option=-optl=-L${zlib.static}/lib"
"--ghc-option=-optl=-L${ncurses.override { enableStatic = true; }}/lib"
"--ghc-option=-optl=-L${gmpStatic}/lib"
"--ghc-option=-optl=-L${zlibStatic}/lib"
"--ghc-option=-optl=-L${ncursesStatic}/lib"
"--ghc-option=-optl=-L${numactlStatic}/lib"
] ++ lib.optional enableSeparateDataOutput "--datadir=$data/share/${ghc.name}"
++ lib.optional doHaddock' "--docdir=${docdir "$doc"}"
++ lib.optional (enableLibraryProfiling || enableExecutableProfiling) "--profiling-detail=${profilingDetail}"
Expand Down
4 changes: 2 additions & 2 deletions lib/materialize.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ let
if materialized != null && !__pathExists materialized
then ''
echo "Materialized nix used for ${name} is missing. To fix run :" >> $ERR
echo " cp -Lr ${calculateNoHash} ${toString materialized}" >> $ERR
echo " cp -r ${calculateNoHash} ${toString materialized}" >> $ERR
echo " chmod -R +w ${toString materialized}" >> $ERR
cat $ERR
false
Expand All @@ -91,7 +91,7 @@ let
diff -ru ${materialized} ${calculateNoHash} || true
echo "Materialized nix used for ${name} incorrect. To fix run :" >> $ERR
echo " rm -rf ${toString materialized}" >> $ERR
echo " cp -Lr ${calculateNoHash} ${toString materialized}" >> $ERR
echo " cp -r ${calculateNoHash} ${toString materialized}" >> $ERR
echo " chmod -R +w ${toString materialized}" >> $ERR
fi
'')
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.