Skip to content

Add +debug to hadrian flavour #1892

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
merged 2 commits into from
Mar 24, 2023
Merged

Add +debug to hadrian flavour #1892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5303edd
Add +debug to hadrian flavour
hamishmack Mar 22, 2023
6c96725
Merge branch 'master' into hkm/fix-debug-ghc
angerman Mar 24, 2023
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
1 change: 1 addition & 0 deletions compiler/ghc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ let
(if targetPlatform.isGhcjs then "quick" else "default")
+ lib.optionalString (!enableShared) "+no_dynamic_ghc"
+ lib.optionalString useLLVM "+llvm"
+ lib.optionalString enableDWARF "+debug_info"
+ lib.optionalString targetPlatform.isGhcjs "+native_bignum+no_profiled_libs"
} --docs=no-sphinx -j --verbose";

Expand Down
2 changes: 1 addition & 1 deletion test/cabal-simple-debug/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let
in recurseIntoAttrs {
# DWARF only works on linux with GHC 8.10.2 and newer
# GHC 9.2.1 disabled because of https://github.com/input-output-hk/haskell.nix/issues/1332
meta.disabled = __elem compiler-nix-name ["ghc865" "ghc884" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927" "ghc941" "ghc942" "ghc943" "ghc944"]
meta.disabled = __elem compiler-nix-name ["ghc865" "ghc884" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so we are going to add back 941, 942, 943, 944?

Copy link
Collaborator Author

@hamishmack hamishmack Mar 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only the compilers in ci.nix are actually tested (so this change will only add ghc944)

|| !stdenv.hostPlatform.isLinux || haskellLib.isCrossHost || stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isAarch64;
ifdInputs = {
inherit (project) plan-nix;
Expand Down