mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Fix a few incorrect paths in some build.info files
The following files referred to ../liblegacy.a when they should have
referred to ../../liblegacy.a. This cause the creation of a mysterious
directory 'crypto/providers', and because of an increased strictness
with regards to where directories are created, configuration failure
on some platforms.
Fixes #23436
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/23452)
(cherry picked from commit 667b45454a
)
This commit is contained in:
parent
f26feac760
commit
ed0f79c7ae
@ -87,7 +87,7 @@ DEFINE[../../providers/libdefault.a]=$AESDEF
|
||||
# already gets everything that the static libcrypto.a has, and doesn't need it
|
||||
# added again.
|
||||
IF[{- !$disabled{module} && !$disabled{shared} -}]
|
||||
DEFINE[../providers/liblegacy.a]=$AESDEF
|
||||
DEFINE[../../providers/liblegacy.a]=$AESDEF
|
||||
ENDIF
|
||||
|
||||
GENERATE[aes-ia64.s]=asm/aes-ia64.S
|
||||
|
@ -103,7 +103,7 @@ DEFINE[../../providers/libdefault.a]=$ECDEF
|
||||
# Otherwise, it already gets everything that the static libcrypto.a
|
||||
# has, and doesn't need it added again.
|
||||
IF[{- !$disabled{module} && !$disabled{shared} -}]
|
||||
DEFINE[../providers/liblegacy.a]=$ECDEF
|
||||
DEFINE[../../providers/liblegacy.a]=$ECDEF
|
||||
ENDIF
|
||||
|
||||
GENERATE[ecp_nistz256-x86.S]=asm/ecp_nistz256-x86.pl
|
||||
|
@ -91,7 +91,7 @@ DEFINE[../../providers/libdefault.a]=$SHA1DEF $KECCAK1600DEF
|
||||
# linked with libcrypto. Otherwise, it already gets everything that
|
||||
# the static libcrypto.a has, and doesn't need it added again.
|
||||
IF[{- !$disabled{module} && !$disabled{shared} -}]
|
||||
DEFINE[../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
|
||||
DEFINE[../../providers/liblegacy.a]=$SHA1DEF $KECCAK1600DEF
|
||||
ENDIF
|
||||
|
||||
GENERATE[sha1-586.S]=asm/sha1-586.pl
|
||||
|
@ -28,7 +28,7 @@ DEFINE[../../providers/libdefault.a]=$SM4DEF
|
||||
# already gets everything that the static libcrypto.a has, and doesn't need it
|
||||
# added again.
|
||||
IF[{- !$disabled{module} && !$disabled{shared} -}]
|
||||
DEFINE[../providers/liblegacy.a]=$SM4DEF
|
||||
DEFINE[../../providers/liblegacy.a]=$SM4DEF
|
||||
ENDIF
|
||||
|
||||
GENERATE[sm4-armv8.S]=asm/sm4-armv8.pl
|
||||
|
Loading…
Reference in New Issue
Block a user