jdk/make/Tools.gmk

*** 36,46 ****
      BUILD_TOOLS_JDK, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes)
  
  ################################################################################
  
  ifeq ($(BOOT_JDK_MODULAR), true)
!   COMPILEFONTCONFIG_ADD_EXPORTS := -XaddExports:java.desktop/sun.awt=ALL-UNNAMED
  endif
  
  TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
      $(COMPILEFONTCONFIG_ADD_EXPORTS) \
      build.tools.compilefontconfig.CompileFontConfig
--- 36,46 ----
      BUILD_TOOLS_JDK, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes)
  
  ################################################################################
  
  ifeq ($(BOOT_JDK_MODULAR), true)
!   COMPILEFONTCONFIG_ADD_EXPORTS := --add-exports java.desktop/sun.awt=ALL-UNNAMED
  endif
  
  TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
      $(COMPILEFONTCONFIG_ADD_EXPORTS) \
      build.tools.compilefontconfig.CompileFontConfig
*** 92,102 ****
  TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp
  
  # Nimbus is used somewhere in the swing build.
  
  ifeq ($(BOOT_JDK_MODULAR), true)
!   COMPILENIMBUS_ADD_MODS := -addmods java.xml.bind
  endif
  
  TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
      $(COMPILENIMBUS_ADD_MODS) \
      build.tools.generatenimbus.Generator
--- 92,102 ----
  TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp
  
  # Nimbus is used somewhere in the swing build.
  
  ifeq ($(BOOT_JDK_MODULAR), true)
!   COMPILENIMBUS_ADD_MODS := --add-modules java.xml.bind
  endif
  
  TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
      $(COMPILENIMBUS_ADD_MODS) \
      build.tools.generatenimbus.Generator