projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9fdb2cc
)
Fix shared build for fips
author
Dr. Stephen Henson
<steve@openssl.org>
Sun, 30 Jan 2011 01:14:34 +0000
(
01:14
+0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sun, 30 Jan 2011 01:14:34 +0000
(
01:14
+0000)
Makefile.org
patch
|
blob
|
history
diff --git
a/Makefile.org
b/Makefile.org
index ddc4e827c165d2fa38a17085d06d1693794826b7..ad956476d5badc73d0b5489cfb254f7272f5fb9d 100644
(file)
--- a/
Makefile.org
+++ b/
Makefile.org
@@
-369,8
+369,12
@@
all_testapps: build_libs build_testapps
build_testapps:
@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
-libcrypto$(SHLIB_EXT): libcrypto.a
+libcrypto$(SHLIB_EXT): libcrypto.a
build_fips
@if [ "$(SHLIB_TARGET)" != "" ]; then \
+ if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+ FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
+ export CC FIPSLD_CC; \
+ fi; \
$(MAKE) SHLIBDIRS=crypto build-shared; \
else \
echo "There's no support for shared libraries on this platform" >&2; \