--- a/src/hotspot/share/classfile/sharedPathsMiscInfo.cpp	Mon Apr 30 13:40:39 2018 -0700
+++ b/src/hotspot/share/classfile/sharedPathsMiscInfo.cpp	Mon Apr 30 16:59:05 2018 -0400
@@ -141,7 +141,7 @@
   switch (type) {
   case BOOT:
     // In the future we should perform the check based on the content of the mapped archive.
-    if (UseAppCDS && os::file_name_strcmp(path, Arguments::get_sysclasspath()) != 0) {
+    if (os::file_name_strcmp(path, Arguments::get_sysclasspath()) != 0) {
       return fail("[BOOT classpath mismatch, actual =", Arguments::get_sysclasspath());
     }
     break;