--- old/make/lib/Awt2dLibraries.gmk	2017-12-01 09:21:50.000000000 -0800
+++ new/make/lib/Awt2dLibraries.gmk	2017-12-01 09:21:50.000000000 -0800
@@ -702,12 +702,6 @@
     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfontmanager, \
 ))
 
-$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
-
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
-  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
-endif
-
 $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager): $(BUILD_LIBFONTMANAGER_TARGET)
 	$(install-file)
         ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
@@ -721,7 +715,15 @@
           endif
         endif
 
-TARGETS += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
+BUILD_LIBFONTMANAGER += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
+
+$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
+
+ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
+  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
+endif
+
+TARGETS += $(BUILD_LIBFONTMANAGER)
 
 ################################################################################