mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 12:09:14 +00:00
Merge
This commit is contained in:
commit
ec533fe7f9
@ -94,3 +94,4 @@ e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
|
||||
7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
|
||||
a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
|
||||
661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
|
||||
366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
|
||||
|
||||
@ -46,7 +46,6 @@ DEPLOY_BUILD_TARGETS = sanity deploy
|
||||
# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifeq ($(PLATFORM), windows)
|
||||
ifneq ($(KERNEL), off)
|
||||
EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
|
||||
$(ECHO) true ; \
|
||||
else \
|
||||
@ -55,7 +54,6 @@ ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifeq ($(EC_TMP), true)
|
||||
DEPLOY_BUILD_TARGETS += extra-comp-all
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user