equal
deleted
inserted
replaced
209 ifeq ($(OPENJDK_TARGET_OS), linux) |
209 ifeq ($(OPENJDK_TARGET_OS), linux) |
210 JDK_LIB_FILES += jexec |
210 JDK_LIB_FILES += jexec |
211 endif |
211 endif |
212 |
212 |
213 # Find all files to copy from $(JDK_OUTPUTDIR)/lib |
213 # Find all files to copy from $(JDK_OUTPUTDIR)/lib |
|
214 # Jar files are not expected to be here |
214 ALL_JDKOUT_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \ |
215 ALL_JDKOUT_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \ |
215 \( -name "_the*" -o -name "javac_state " \) ) |
216 \( -name "_the*" -o -name "javac_state " -o -name "*.jar" \) ) |
216 # Find all files to copy from $(IMAGES_OUTPUTDIR)/lib |
217 # Find all files to copy from $(IMAGES_OUTPUTDIR)/lib |
217 # This might not exist if building overlay-images |
218 # This is were the jar files are and might not exist if building overlay-images |
218 ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib),) |
219 ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib),) |
219 ALL_IMAGES_LIB_LIST := $(shell $(FIND) $(IMAGES_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \ |
220 ALL_IMAGES_LIB_LIST := $(shell $(FIND) $(IMAGES_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \ |
220 \( -name "_the*" -o -name "javac_state " \) ) |
221 \( -name "_the*" -o -name "javac_state " \) ) |
221 endif |
222 endif |
222 |
223 |