Skip to content

gh-99108: Build the hashlib HACL* code as a static library. (fix wasm builds) #101917

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
gpshead merged 4 commits into from
Feb 14, 2023
+34 −4
Merged

gh-99108: Build the hashlib HACL* code as a static library. (fix wasm builds) #101917

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22b2267
Build HACL* SHA2 as a static library.
gpshead Feb 14, 2023
3c7e18e
direct .a reference (no real difference)
gpshead Feb 14, 2023
a5bb63e
use -l instead of the .a file again.
gpshead Feb 14, 2023
6cd13a4
Go back to the .a file, emcc undoes -L -l anyways.
gpshead Feb 14, 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
Prev Previous commit
Next Next commit
use -l instead of the .a file again. 
is this the problem? the .a file is showing up on the emcc linking command line
twice, is that really the source of the "duplicate" symbols?  is emcc that
dumb?
  • Loading branch information
@gpshead
gpshead committed Feb 14, 2023
commit a5bb63e5e00a27980ab55fab116cc85fe25b155f
4 changes: 2 additions & 2 deletions Modules/Setup.stdlib.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
# hashing builtins, can be disabled with --without-builtin-hashlib-hashes
@MODULE__MD5_TRUE@_md5 md5module.c
@MODULE__SHA1_TRUE@_sha1 sha1module.c
@MODULE__SHA256_TRUE@_sha256 sha256module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Streaming_SHA2.a
@MODULE__SHA512_TRUE@_sha512 sha512module.c -I$(srcdir)/Modules/_hacl/include Modules/_hacl/libHacl_Streaming_SHA2.a
@MODULE__SHA256_TRUE@_sha256 sha256module.c -I$(srcdir)/Modules/_hacl/include -LModules/_hacl -lHacl_Streaming_SHA2
@MODULE__SHA512_TRUE@_sha512 sha512module.c -I$(srcdir)/Modules/_hacl/include -LModules/_hacl -lHacl_Streaming_SHA2
@MODULE__SHA3_TRUE@_sha3 _sha3/sha3module.c
@MODULE__BLAKE2_TRUE@_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c

Expand Down