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:
0ec1a77
)
Makefile.org: make FIPS build work with BSD make.
author
Andy Polyakov
<appro@openssl.org>
Sun, 10 Nov 2013 22:06:41 +0000
(23:06 +0100)
committer
Andy Polyakov
<appro@openssl.org>
Sun, 10 Nov 2013 22:08:25 +0000
(23:08 +0100)
(cherry picked from commit
60adefa61025ffd7d56cf7ff8491008f783282bf
)
Makefile.org
patch
|
blob
|
history
diff --git
a/Makefile.org
b/Makefile.org
index 2db31ead6fa9fa3565b9bf84119023fb8e5f6775..0368ed950892e3216a20a26fa43346fa85f991c7 100644
(file)
--- a/
Makefile.org
+++ b/
Makefile.org
@@
-302,7
+302,8
@@
libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
fi; \
- $(MAKE) -e SHLIBDIRS=crypto build-shared; \
+ $(MAKE) -e SHLIBDIRS=crypto CC=$${CC:-$(CC)} build-shared; \
+ touch -c fips_premain_dso($EXE_EXT); \
else \
echo "There's no support for shared libraries on this platform" >&2; \
exit 1; \