Skip to content

Commit

Permalink
haskell.compiler.*: let configure know about objdump
Browse files Browse the repository at this point in the history
This seems to be a build time only dependency as there is no
corresponding settings entry.
  • Loading branch information
sternenseemann committed Sep 23, 2024
1 parent cde17cb commit 9386bb8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkgs/development/compilers/ghc/8.10.7.nix
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ let
ranlib = cc.bintools.bintools;
nm = cc.bintools.bintools;
readelf = cc.bintools.bintools;
objdump = cc.bintools;

ld = cc.bintools;
"ld.gold" = cc.bintools;
Expand Down Expand Up @@ -330,6 +331,7 @@ stdenv.mkDerivation (rec {
export RANLIB="${toolPath "ranlib" targetCC}"
export READELF="${toolPath "readelf" targetCC}"
export STRIP="${toolPath "strip" targetCC}"
export OBJDUMP="${toolPath "objdump" targetCC}"
'' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${toolPath "otool" targetCC}"
export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/compilers/ghc/common-hadrian.nix
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ let
ranlib = cc.bintools.bintools;
nm = cc.bintools.bintools;
readelf = cc.bintools.bintools;
objdump = cc.bintools;

ld = cc.bintools;
"ld.gold" = cc.bintools;
Expand Down Expand Up @@ -418,6 +419,7 @@ stdenv.mkDerivation ({
export RANLIB="${toolPath "ranlib" targetCC}"
export READELF="${toolPath "readelf" targetCC}"
export STRIP="${toolPath "strip" targetCC}"
export OBJDUMP="${toolPath "objdump" targetCC}"
'' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${toolPath "otool" targetCC}"
export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/compilers/ghc/common-make-native-bignum.nix
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ let
ranlib = cc.bintools.bintools;
nm = cc.bintools.bintools;
readelf = cc.bintools.bintools;
objdump = cc.bintools;

ld = cc.bintools;
"ld.gold" = cc.bintools;
Expand Down Expand Up @@ -331,6 +332,7 @@ stdenv.mkDerivation (rec {
export RANLIB="${toolPath "ranlib" targetCC}"
export READELF="${toolPath "readelf" targetCC}"
export STRIP="${toolPath "strip" targetCC}"
export OBJDUMP="${toolPath "objdump" targetCC}"
'' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export OTOOL="${toolPath "otool" targetCC}"
export INSTALL_NAME_TOOL="${toolPath "install_name_tool" targetCC}"
Expand Down

0 comments on commit 9386bb8

Please sign in to comment.