Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the directory of any file on the command line in the include path rather than "." #3690

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
other projects, notably karamel, rely on . being in the include path;…
… try to retain it at a lower precedence
nikswamy committed Jan 20, 2025
commit 00bf851e42dc660913cff99f1ff2e1938a1f0b7e
3 changes: 2 additions & 1 deletion src/basic/FStarC.Find.fst
Original file line number Diff line number Diff line change
@@ -93,7 +93,8 @@ let include_path () =
let cmd_line_file_dirs =
Options.file_list() |> List.map (fun f -> BU.normalize_file_path <| BU.dirname f)
in
cache_dir @ lib_paths () @ include_paths @ cmd_line_file_dirs
let cwd = expand_include_d "." |> List.map BU.normalize_file_path in
cache_dir @ lib_paths () @ include_paths @ cwd @ cmd_line_file_dirs

let do_find (paths : list string) (filename : string) : option string =
if BU.is_path_absolute filename then
Loading