diff options
| author | erikj <none@none> | 2014-02-06 08:58:18 +0100 |
|---|---|---|
| committer | erikj <none@none> | 2014-02-06 08:58:18 +0100 |
| commit | aed25b5ae431467782ed94e63a647608f7db4f87 (patch) | |
| tree | e4f581b89cda95739e74141a0c9f96dc58ca2751 /make | |
| parent | ed7aeadf8d242dc2db2e815f1cf3b7589d1bc182 (diff) | |
| download | jdk8u-aed25b5ae431467782ed94e63a647608f7db4f87.tar.gz | |
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
Diffstat (limited to 'make')
| -rw-r--r-- | make/common/JavaCompilation.gmk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk index 6180327..9415c10 100644 --- a/make/common/JavaCompilation.gmk +++ b/make/common/JavaCompilation.gmk @@ -527,16 +527,16 @@ define SetupJavaCompilation # 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. 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 $(MKDIR) -p $$(@D) - for f in `ls $$($1_HEADERS).tmp`; do \ - if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \ - $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \ + for f in `ls $$($1_HEADERS).$1.tmp`; do \ + if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \ + $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \ fi; \ done - $(RM) -r $$($1_HEADERS).tmp + $(RM) -r $$($1_HEADERS).$1.tmp $(TOUCH) $$@ $1 += $$($1_HEADERS)/_the.$1_headers |