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

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 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.
@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 eadwu force-pushed the eadwu:wabt/wasm2c-headers branch from bf10b71 to 418e83a May 7, 2020
@eadwu
Copy link
Member Author

eadwu commented May 7, 2020

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 eadwu:wabt/wasm2c-headers branch 2 times, most recently from 2d5283a to ac0d4ed May 7, 2020
@eadwu eadwu force-pushed the eadwu:wabt/wasm2c-headers branch from ac0d4ed to 436c154 May 7, 2020
@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
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="436c154"; rev="436c1540bd9732a65dda1939eb1fa1fc88c2ce56"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="436c154"; rev="436c1540bd9732a65dda1939eb1fa1fc88c2ce56"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="436c154"; rev="436c1540bd9732a65dda1939eb1fa1fc88c2ce56"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="436c154"; rev="436c1540bd9732a65dda1939eb1fa1fc88c2ce56"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="436c154"; rev="436c1540bd9732a65dda1939eb1fa1fc88c2ce56"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="436c154"; rev="436c1540bd9732a65dda1939eb1fa1fc88c2ce56"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="436c154"; rev="436c1540bd9732a65dda1939eb1fa1fc88c2ce56"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
wabt, wabt.passthru.tests on aarch64-linux Success
Details
wabt, wabt.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.