Forráskód Böngészése

[compiler] restore previous classpath order, ignore non-existing std path

Rudy Ges 1 éve
szülő
commit
f85b2b72a6
1 módosított fájl, 5 hozzáadás és 4 törlés
  1. 5 4
      src/compiler/compiler.ml

+ 5 - 4
src/compiler/compiler.ml

@@ -224,11 +224,12 @@ module Setup = struct
 				]
 				]
 
 
 	let init_std_class_paths com =
 	let init_std_class_paths com =
-		com.class_paths#add com.empty_class_path;
 		List.iter (fun (s,scope) ->
 		List.iter (fun (s,scope) ->
-			let cp = new ClassPath.directory_class_path s scope in
-			com.class_paths#add cp
-		) (List.rev (get_std_class_paths ()))
+			if Sys.file_exists s then
+				let cp = new ClassPath.directory_class_path s scope in
+				com.class_paths#add cp
+		) (List.rev (get_std_class_paths ()));
+		com.class_paths#add com.empty_class_path
 
 
 	let setup_common_context ctx =
 	let setup_common_context ctx =
 		let com = ctx.com in
 		let com = ctx.com in