Merge branch 'openssl3-nodso' into 'master'

Fix openssl3 for platforms without shared libs

See merge request redox-os/redox!1940
This commit is contained in:
Jeremy Soller 2026-02-24 06:33:11 -07:00
commit b449c34691
2 changed files with 2 additions and 2 deletions

View File

@ -27,7 +27,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
if [ "${COOKBOOK_DYNAMIC}" = "1" ]; then
COOKBOOK_CONFIGURE_FLAGS+=(shared)
else
COOKBOOK_CONFIGURE_FLAGS+=(no-shared)
COOKBOOK_CONFIGURE_FLAGS+=(no-shared no-dso)
fi
"${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"

View File

@ -36,7 +36,7 @@ diff -ruwN source/Configurations/10-main.conf source-new/Configurations/10-main.
+ inherit_from => [ "redox-generic64" ],
+ perlasm_scheme => "linux64",
+ },
+ "redox-i686" => {
+ "redox-i586" => {
+ inherit_from => [ "redox-common" ],
+ bn_ops => "BN_LLONG",
+ perlasm_scheme => "elf",