langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java

*** 174,189 ****
          }
  
          log = Log.instance(context);
  
          if (argv.length == 0) {
!             Option.HELP.process(new OptionHelper.GrumpyHelper(log) {
                  @Override
                  public String getOwnName() { return ownName; }
                  @Override
                  public void put(String name, String value) { }
!             }, "-help");
              return Result.CMDERR;
          }
  
          // prefix argv with contents of _JAVAC_OPTIONS if set
          String envOpt = System.getenv("_JAVAC_OPTIONS");
--- 174,190 ----
          }
  
          log = Log.instance(context);
  
          if (argv.length == 0) {
!             OptionHelper h = new OptionHelper.GrumpyHelper(log) {
                  @Override
                  public String getOwnName() { return ownName; }
                  @Override
                  public void put(String name, String value) { }
!             };
!             Option.HELP.process(h, "-help");
              return Result.CMDERR;
          }
  
          // prefix argv with contents of _JAVAC_OPTIONS if set
          String envOpt = System.getenv("_JAVAC_OPTIONS");
*** 264,277 ****
              BasicJavacTask t = (BasicJavacTask) BasicJavacTask.instance(context);
              t.initPlugins(pluginOpts);
          }
  
          // init multi-release jar handling
!         if (fileManager.isSupportedOption(Option.MULTIRELEASE.text) == 1) {
              Target target = Target.instance(context);
              List<String> list = List.of(target.multiReleaseValue());
!             fileManager.handleOption(Option.MULTIRELEASE.text, list.iterator());
          }
  
          // init JavaCompiler
          JavaCompiler comp = JavaCompiler.instance(context);
  
--- 265,278 ----
              BasicJavacTask t = (BasicJavacTask) BasicJavacTask.instance(context);
              t.initPlugins(pluginOpts);
          }
  
          // init multi-release jar handling
!         if (fileManager.isSupportedOption(Option.MULTIRELEASE.primaryName) == 1) {
              Target target = Target.instance(context);
              List<String> list = List.of(target.multiReleaseValue());
!             fileManager.handleOption(Option.MULTIRELEASE.primaryName, list.iterator());
          }
  
          // init JavaCompiler
          JavaCompiler comp = JavaCompiler.instance(context);