Skip to content

Fix TH code in checks for android cross compilation #2414

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 3 commits into from
Jul 15, 2025

Conversation

hamishmack
Copy link
Collaborator

No description provided.

@hamishmack hamishmack requested a review from Copilot July 15, 2025 05:14
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the Android cross‐compilation checks and test executables to use haskellLib.check, and refactors the component builder to preserve default flags when overridden.

  • Wraps just-template-haskell binaries in haskellLib.check for both standard and “ei” builds.
  • Adjusts lib/check.nix override to append to any existing setupBuildFlags on Android.
  • Refactors builder/comp-builder.nix to use lib.makeOverridable after applying default arguments, with an expanded argument list.

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File Description
test/th-dlls/default.nix Switches just-template-haskell executables to use haskellLib.check
lib/check.nix Updates Android override to preserve and append to existing flags
builder/comp-builder.nix Moves makeOverridable call below defaults and duplicates the arg list

@@ -92,7 +90,76 @@ let self =
# LLVM
, useLLVM ? ghc.useLLVM or false
, smallAddressSpace ? false

}:
# makeOverridable is called here after all the `? DEFAULT` arguments
Copy link
Preview

Copilot AI Jul 15, 2025

Choose a reason for hiding this comment

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

[nitpick] The large duplicated argument list between the function signature and the final inherit block can be error-prone to maintain. Consider generating the inherit list programmatically or centralizing the parameter list to avoid drift.

Copilot uses AI. Check for mistakes.

hamishmack and others added 2 commits July 15, 2025 17:18
@hamishmack hamishmack requested a review from angerman July 15, 2025 05:20
@hamishmack hamishmack merged commit 35121df into master Jul 15, 2025
28 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant