8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows
authorerikj
Mon, 03 Jul 2017 10:27:42 +0200
changeset 45781 0491f891667c
parent 45780 6cb3083465e5
child 45782 a7697c107dd9
8183166: lib\jawt.lib is missing from JDK 9 distribution for Windows Reviewed-by: ihse
jdk/make/lib/Awt2dLibraries.gmk
--- a/jdk/make/lib/Awt2dLibraries.gmk	Thu Jun 29 17:12:14 2017 -0700
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Mon Jul 03 10:27:42 2017 +0200
@@ -749,12 +749,14 @@
 
   $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
 
-  $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
-	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%, %, $@))
-	$(call MakeDir, $(@D))
-	$(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
+  $(eval $(call SetupCopyFiles, COPY_JAWT_LIB, \
+      FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX), \
+      DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
+  ))
 
-  TARGETS += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
+  $(COPY_JAWT_LIB): $(BUILD_LIBJAWT)
+
+  TARGETS += $(COPY_JAWT_LIB)
 
 else # OPENJDK_TARGET_OS not windows