提交 043161a5 编写于 作者: E erikj

8033210: Intermittent build failure: jdk8 fails on win_i586 in jdk/make...

8033210: Intermittent build failure: jdk8 fails on win_i586 in jdk/make (p11_convert.c(67) : Cannot open 'sun_security_pkcs11_wrapper_PKCS11.h)
Reviewed-by: ihse, tbell
上级 04155196
...@@ -527,16 +527,16 @@ define SetupJavaCompilation ...@@ -527,16 +527,16 @@ define SetupJavaCompilation
# When building in batch, put headers in a temp dir to filter out those that actually # When building in batch, put headers in a temp dir to filter out those that actually
# changed before copying them to the real header dir. # changed before copying them to the real header dir.
ifneq (,$$($1_HEADERS)) ifneq (,$$($1_HEADERS))
$1_HEADERS_ARG := -h $$($1_HEADERS).tmp $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp
$$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
$(MKDIR) -p $$(@D) $(MKDIR) -p $$(@D)
for f in `ls $$($1_HEADERS).tmp`; do \ for f in `ls $$($1_HEADERS).$1.tmp`; do \
if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \ if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
$(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \ $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \
fi; \ fi; \
done done
$(RM) -r $$($1_HEADERS).tmp $(RM) -r $$($1_HEADERS).$1.tmp
$(TOUCH) $$@ $(TOUCH) $$@
$1 += $$($1_HEADERS)/_the.$1_headers $1 += $$($1_HEADERS)/_the.$1_headers
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册