changeset 10907:f3e7e6511763

8062312: OpenJDK build fails when bundling freetype libraries Reviewed-by: prr, erikj
author simonis
date Wed, 29 Oct 2014 14:51:51 +0100
parents 173916b1007e
children 539a30f006f3 58bd67fe44f1
files make/copy/Copy-java.desktop.gmk
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/copy/Copy-java.desktop.gmk	Wed Oct 29 14:10:34 2014 +0100
+++ b/make/copy/Copy-java.desktop.gmk	Wed Oct 29 14:51:51 2014 +0100
@@ -67,8 +67,11 @@
     FREETYPE_TARGET_LIB := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
   endif
 
+  # We can't use $(install-file) in this rule because it preserves symbolic links and
+  # libfreetype.so is usually a symbolic link to something like libfreetype.so.6 on Unix.
   $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
-	$(install-file)
+	$(MKDIR) -p $(@D)
+	$(CP) $< $@
         ifeq ($(OPENJDK_BUILD_OS), windows)
 	  $(CHMOD) +rx $@
         endif