equal
deleted
inserted
replaced
364 # Avoid doing the expensive find unless called with "jdk" as target. |
364 # Avoid doing the expensive find unless called with "jdk" as target. |
365 ifneq ($(filter jdk, $(MAKECMDGOALS)), ) |
365 ifneq ($(filter jdk, $(MAKECMDGOALS)), ) |
366 |
366 |
367 DEMO_FILES := \ |
367 DEMO_FILES := \ |
368 $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \ |
368 $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \ |
369 $(call DoubleDollar, $(call DoubleDollar, \ |
369 $(call DoubleDollar, \ |
370 $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \ |
370 $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \ |
371 -type f -a ! \( -name "_the*" -o -name "javac_state" \) ))) \ |
371 -type f -a ! \( -name "_the*" -o -name "javac_state" \) )) \ |
372 ) |
372 ) |
373 |
373 |
374 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true) |
374 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true) |
375 ifeq ($(OPENJDK_TARGET_OS), macosx) |
375 ifeq ($(OPENJDK_TARGET_OS), macosx) |
376 DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES)) |
376 DEMO_FILES := $(call not-containing, .dSYM, $(DEMO_FILES)) |