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:
32171e4
)
Makefile.org: mask touch's exit code
author
Andy Polyakov
<appro@openssl.org>
Thu, 27 Feb 2014 11:35:02 +0000
(12:35 +0100)
committer
Andy Polyakov
<appro@openssl.org>
Thu, 27 Feb 2014 11:37:08 +0000
(12:37 +0100)
[but don't let it mask make's].
PR: 3269
(cherry picked from commit
2f34088e5e9ff02ad20df50571073abac04f1431
)
Makefile.org
patch
|
blob
|
history
diff --git
a/Makefile.org
b/Makefile.org
index 65a686d3826e3012c9cd9b92b4a0f48d7d5cc2cc..c92806f9201fe56a75a0bf28fcd997119dd13ae2 100644
(file)
--- a/
Makefile.org
+++ b/
Makefile.org
@@
-302,8
+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 CC="$${CC:-$(CC)}" build-shared
;
\
-
touch -c fips_premain_dso$(EXE_EXT
); \
+ $(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; \