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

Jump to bottom

wabt: include header files #87141

Merged
merged 1 commit into from May 7, 2020
Merged

wabt: include header files #87141

merged 1 commit into from May 7, 2020

Conversation

eadwu
Copy link
Member

@eadwu eadwu commented May 6, 2020

Needed to compile source files generated by wasm2c

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from Ekleog May 6, 2020 21:55
@Ekleog
Copy link
Member

Ekleog commented May 7, 2020

Would it be possible to compile the .c into a .a static-linking library? That'd probably be the best way to do it, this way -lwasm2c would work properly :)

@eadwu
Copy link
Member Author

eadwu commented May 7, 2020 •
edited

Converted to static library and kept the .h files in $out/include.

Tried a simple compilation and it works with -L ${pkgs.wabt}/lib -lwasm-rt-impl -I${pkgs.wabt}/include.

Not sure how good my CMake addition is though

@eadwu eadwu force-pushed the wabt/wasm2c-headers branch 2 times, most recently from 2d5283a to ac0d4ed Compare May 7, 2020 16:24
@Ekleog
Copy link
Member

Ekleog commented May 7, 2020

Looks good to me! Let's hope the patch is merged in the next release :)

@Ekleog Ekleog merged commit 5a15cb9 into NixOS:master May 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@Ekleog Ekleog Awaiting requested review from Ekleog

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@eadwu @Ekleog @Mic92