Skip to content
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

Rename wasi-cross to wasm-cross #181

Merged
merged 1 commit into from
Aug 17, 2023

Conversation

chreekat
Copy link
Contributor

@chreekat chreekat commented Aug 8, 2023

Retains wasi-cross (and withWasiSDK) as backward compat synonyms.

This is a followup to Ben's comment.

Note there is one FIXME [edit: resolved now] at the bottom of ghc.nix. I don't know what addWasiSDKHook is used for, if anything, so I haven't changed it.

ghc.nix Outdated
@@ -270,7 +278,9 @@ hspkgs.shellFor rec {
${lib.optionalString withDocs "export FONTCONFIG_FILE=${fonts}"}

# N.B. This overrides CC, CONFIGURE_ARGS, etc. to configure the cross-compiler.
${lib.optionalString withWasiSDK "addWasiSDKHook"}
# FIXME: This bit is undocumented so I don't know what effect renaming it to
Copy link
Contributor

Choose a reason for hiding this comment

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

It's defined at https://gitlab.haskell.org/ghc/ghc-wasm-meta/-/blob/master/pkgs/wasi-sdk-setup-hook.sh and sets up various env vars to override the existing toolchain provided by stdenv. So don't change the name, but indeed it might be worth adding a comment that refers to this url for clarity

README.md Outdated Show resolved Hide resolved
@chreekat
Copy link
Contributor Author

Thanks @TerrorJack . I've done as you suggested.

Retains wasi-cross (and withWasiSDK) as backward compat synonyms.
@supersven supersven merged commit 7c915b3 into alpmestan:master Aug 17, 2023
2 checks passed
@chreekat chreekat deleted the b/rename-wasm-cross branch August 21, 2023 08:29
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.

3 participants