make/copy/Copy-java.desktop.gmk

Print this page
rev 10871 : 8062312: OpenJDK build fails when bundling freetype libraries

*** 66,76 **** else FREETYPE_TARGET_LIB := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 endif $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) ! $(install-file) ifeq ($(OPENJDK_BUILD_OS), windows) $(CHMOD) +rx $@ endif endif --- 66,77 ---- else FREETYPE_TARGET_LIB := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 endif $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype) ! $(MKDIR) -p $(@D) ! $(CP) $< $@ ifeq ($(OPENJDK_BUILD_OS), windows) $(CHMOD) +rx $@ endif endif