diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java index dfe36cfb77fd..de407337f12f 100644 --- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java +++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java @@ -76,8 +76,6 @@ boolean consume(ArgumentQueue args) { private boolean consume(ArgumentQueue args, String headArg) { switch (headArg) { case "--help": - args.poll(); - singleArgumentCheck(args, headArg); nativeImage.showMessage(HELP_TEXT); nativeImage.showNewline(); nativeImage.apiOptionHandler.printOptions(nativeImage::showMessage, false); @@ -85,14 +83,10 @@ private boolean consume(ArgumentQueue args, String headArg) { System.exit(ExitStatus.OK.getValue()); return true; case "--version": - args.poll(); - singleArgumentCheck(args, headArg); printVersion(); System.exit(ExitStatus.OK.getValue()); return true; case "--help-extra": - args.poll(); - singleArgumentCheck(args, headArg); nativeImage.showMessage(HELP_EXTRA_TEXT); nativeImage.apiOptionHandler.printOptions(nativeImage::showMessage, true); nativeImage.showNewline(); @@ -235,12 +229,6 @@ private void printVersion() { nativeImage.showMessage("%s%s (%sbuild %s, %s)", javaVMName, vendorVersion, jdkDebugLevel, javaVMVersion, javaVMInfo); } - private static void singleArgumentCheck(ArgumentQueue args, String arg) { - if (!args.isEmpty()) { - NativeImage.showError("Option " + arg + " cannot be combined with other options."); - } - } - @Override void addFallbackBuildArgs(List buildArgs) { if (nativeImage.isVerbose()) {