make/CreateJmods.gmk

@@ -80,10 +80,18 @@
     JMOD_FLAGS += --module-path $(JMODS_DIR) \
         --hash-modules '^(?!$(EXCLUDE_PATTERN))'
   endif
 endif
 
+ifeq ($(MODULE), jdk.scripting.nashorn.shell)
+    JMOD_FLAGS += --main-class jdk.nashorn.tools.jjs.Main
+endif
+
+ifeq ($(MODULE), jdk.scripting.nashorn)
+    JMOD_FLAGS += --main-class jdk.nashorn.tools.Shell
+endif
+
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
 # The variable JMOD_CMD could contain an environment variable assignment before
 # the actual command. Filter that out using wildcard before adding to DEPS.
 DEPS += $(wildcard $(JMOD_CMD))
 ifeq ($(EXTERNAL_BUILDJDK), false)