Thu, 06 Feb 2014 08:58:18 +0100
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
make/common/JavaCompilation.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/make/common/JavaCompilation.gmk Tue Feb 04 18:33:54 2014 -0800 1.2 +++ b/make/common/JavaCompilation.gmk Thu Feb 06 08:58:18 2014 +0100 1.3 @@ -527,16 +527,16 @@ 1.4 # When building in batch, put headers in a temp dir to filter out those that actually 1.5 # changed before copying them to the real header dir. 1.6 ifneq (,$$($1_HEADERS)) 1.7 - $1_HEADERS_ARG := -h $$($1_HEADERS).tmp 1.8 + $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp 1.9 1.10 $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch 1.11 $(MKDIR) -p $$(@D) 1.12 - for f in `ls $$($1_HEADERS).tmp`; do \ 1.13 - if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \ 1.14 - $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \ 1.15 + for f in `ls $$($1_HEADERS).$1.tmp`; do \ 1.16 + if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \ 1.17 + $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \ 1.18 fi; \ 1.19 done 1.20 - $(RM) -r $$($1_HEADERS).tmp 1.21 + $(RM) -r $$($1_HEADERS).$1.tmp 1.22 $(TOUCH) $$@ 1.23 1.24 $1 += $$($1_HEADERS)/_the.$1_headers