Skip to content

Commit d6be9fb

Browse files
[3.14] gh-146264: Use static HACL deps for static module builds (GH-146265) (#148403)
gh-146264: Use static HACL deps for static module builds (GH-146265) (cherry picked from commit f445d2e) Co-authored-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
1 parent 6112e2d commit d6be9fb

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix static module builds on non-WASI targets by linking HACL dependencies as
2+
static libraries when ``MODULE_BUILDTYPE=static``, preventing duplicate
3+
``_Py_LibHacl_*`` symbol errors at link time.

configure

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8089,7 +8089,7 @@ AC_SUBST([LIBHACL_BLAKE2_SIMD256_OBJS])
80898089
# HACL*-based cryptographic primitives
80908090

80918091
AC_MSG_CHECKING([for HACL* library linking type])
8092-
if test "$ac_sys_system" = "WASI"; then
8092+
if test "$ac_sys_system" = "WASI" || test "$MODULE_BUILDTYPE" = "static"; then
80938093
LIBHACL_LDEPS_LIBTYPE=STATIC
80948094
AC_MSG_RESULT([static])
80958095
else

0 commit comments

Comments
 (0)