--- a/jdk/src/java.base/share/native/libjli/args.c	Tue Jan 31 21:33:54 2017 +0000
+++ b/jdk/src/java.base/share/native/libjli/args.c	Tue Jan 31 14:47:57 2017 -0800
@@ -429,6 +429,10 @@
 }
 
 jboolean JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
+
+#ifndef ENABLE_JAVA_OPTIONS
+    return JNI_FALSE;
+#else
     char *env = getenv(var_name);
     char *p, *arg;
     char quote;
@@ -515,6 +519,7 @@
     }
 
     return JNI_TRUE;
+#endif
 }
 
 #ifdef DEBUG_ARGFILE