changeset 12295:cc0b239d99a9

8141590: Cannot build Zero with devkit Reviewed-by: ihse
author erikj
date Wed, 07 Dec 2016 16:08:23 +0100
parents bdfe30141ef6
children 30e1996bd55d d79c6d6c5759
files make/copy/Copy-java.base.gmk
diffstat 1 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/copy/Copy-java.base.gmk	Wed Dec 07 09:48:57 2016 +0100
+++ b/make/copy/Copy-java.base.gmk	Wed Dec 07 16:08:23 2016 +0100
@@ -65,3 +65,17 @@
 #TARGETS += $(INCLUDE_DST_DIR)/$(JNI_MD_SUBDIR)/jni_md.h
 
 ################################################################################
+# Optionally copy libffi.so.? into the the image
+
+ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
+  $(eval $(call SetupCopyFiles, COPY_LIBFFI, \
+      FILES := $(LIBFFI_LIB_FILE), \
+      DEST := $(call FindLibDirForModule, $(MODULE)), \
+      FLATTEN := true, \
+      MACRO := install-file-nolink, \
+  ))
+
+  TARGETS += $(COPY_LIBFFI)
+endif
+
+################################################################################