equal
deleted
inserted
replaced
94 build.tools.charsetmapping.Main $(LOG_INFO) |
94 build.tools.charsetmapping.Main $(LOG_INFO) |
95 |
95 |
96 TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp |
96 TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp |
97 |
97 |
98 # Nimbus is used somewhere in the swing build. |
98 # Nimbus is used somewhere in the swing build. |
|
99 |
|
100 ifeq ($(BOOT_JDK_MODULAR), true) |
|
101 COMPILENIMBUS_ADD_MODS := -addmods java.xml.bind |
|
102 endif |
|
103 |
99 TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
104 TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
|
105 $(COMPILENIMBUS_ADD_MODS) \ |
100 build.tools.generatenimbus.Generator |
106 build.tools.generatenimbus.Generator |
101 |
107 |
102 TOOL_WRAPPERGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
108 TOOL_WRAPPERGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
103 build.tools.x11wrappergen.WrapperGenerator |
109 build.tools.x11wrappergen.WrapperGenerator |
104 |
110 |