diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-01-25 21:29:07 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-01-25 21:29:07 +0000 |
| commit | 613f1c7e91c6e80813e182732d301b2c8b977691 (patch) | |
| tree | 4602ad1edcfb6fe2174acb560ea080a9f856cbe9 | |
| parent | 9c823a2ab4f86076d6c6a70ef1cfd8b6d7ba902c (diff) | |
| download | openssl-new-613f1c7e91c6e80813e182732d301b2c8b977691.tar.gz | |
Fixes to build system to cleanly handle fipsdso
| -rw-r--r-- | fips-1.0/Makefile | 2 | ||||
| -rwxr-xr-x | fips-1.0/fipsld | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fips-1.0/Makefile b/fips-1.0/Makefile index c6812e6455..da156514da 100644 --- a/fips-1.0/Makefile +++ b/fips-1.0/Makefile @@ -137,7 +137,7 @@ lib: $(FIPSCANLOC) delexobj @touch lib shared: fips_premain_dso$(EXE_EXT) - if [ -n "$(SHARED_LIBS)" ]; then \ + if [ -n "$(SHARED_LIBS)" -a "$(FIPSCANLIB)" != "libfips" ]; then \ (cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); \ fi diff --git a/fips-1.0/fipsld b/fips-1.0/fipsld index 3db6fc3fb7..d5fd785fab 100755 --- a/fips-1.0/fipsld +++ b/fips-1.0/fipsld @@ -64,7 +64,7 @@ case "${TARGET}" in esac case "${TARGET}" in -*${FIPCANLIB}*|*.dll) # must be linking a shared lib... +*${FIPSCANLIB}*|*.dll) # must be linking a shared lib... # Shared lib creation can be taking place in the source # directory only!!! FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1" |