Skip to content

Commit

Permalink
haskell.compiler.*: use symlinks from bintool wrapper if possible
Browse files Browse the repository at this point in the history
Ideally we don't want to use bintools.bintools and also not really
encode knowledge of what is wrapped and what not in our GHC derivation.
Unfortunately, not all tools are part of the wrapper derivation as well.
This should be gradually improved (e.g. in the case of the darwin tools
and strip).
  • Loading branch information
sternenseemann committed Sep 23, 2024
1 parent 9386bb8 commit 3a3f4ad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions pkgs/development/compilers/ghc/8.10.7.nix
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,12 @@ let
tools = {
"cc" = cc;
"c++" = cc;
as = cc.bintools.bintools;
as = cc.bintools;

ar = cc.bintools.bintools;
ranlib = cc.bintools.bintools;
nm = cc.bintools.bintools;
readelf = cc.bintools.bintools;
ar = cc.bintools;
ranlib = cc.bintools;
nm = cc.bintools;
readelf = cc.bintools;
objdump = cc.bintools;

ld = cc.bintools;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/ghc/common-hadrian.nix
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,12 @@ let
tools = {
"cc" = cc;
"c++" = cc;
as = cc.bintools.bintools;
as = cc.bintools;

ar = cc.bintools.bintools;
ranlib = cc.bintools.bintools;
nm = cc.bintools.bintools;
readelf = cc.bintools.bintools;
ar = cc.bintools;
ranlib = cc.bintools;
nm = cc.bintools;
readelf = cc.bintools;
objdump = cc.bintools;

ld = cc.bintools;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/ghc/common-make-native-bignum.nix
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ let
tools = {
"cc" = cc;
"c++" = cc;
as = cc.bintools.bintools;
as = cc.bintools;

ar = cc.bintools.bintools;
ranlib = cc.bintools.bintools;
nm = cc.bintools.bintools;
readelf = cc.bintools.bintools;
ar = cc.bintools;
ranlib = cc.bintools;
nm = cc.bintools;
readelf = cc.bintools;
objdump = cc.bintools;

ld = cc.bintools;
Expand Down

0 comments on commit 3a3f4ad

Please sign in to comment.