From aadcfa31f19559b2a8a355736e3dfc4795e0a2d9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 7 Jan 2020 18:24:19 +0000 Subject: [PATCH] cmdline: Don't convert Goalfile, includes to absolute paths. We actually want these to be relative to the -C directory, same as make. --- src/cmdline.ml | 4 ++-- src/cmdline.mli | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cmdline.ml b/src/cmdline.ml index f98e0a8..fdf7ce6 100644 --- a/src/cmdline.ml +++ b/src/cmdline.ml @@ -89,9 +89,9 @@ let input_file, let args = List.rev !args in let debug_flag = !debug_flag in let directory = !directory in - let input_file = absolute_path !input_file in + let input_file = !input_file in (* Don't reverse includes - we want newer -I options to take precedence. *) - let includes = List.map absolute_path !includes in + let includes = !includes in let use_prelude = !use_prelude in (* Get the anon var assignments and targets. *) diff --git a/src/cmdline.mli b/src/cmdline.mli index aed4e8b..f29bb84 100644 --- a/src/cmdline.mli +++ b/src/cmdline.mli @@ -27,8 +27,7 @@ val prelude_sh_file : string (** Get the absolute path of the prelude.sh file. *) val input_file : string -(** Get the name of the input Goalfile. - This is an absolute path. *) +(** Get the name of the input Goalfile. *) val debug : ('a, unit, string, unit) format4 -> 'a (** If debugging is enabled (-d option) then print the formatted @@ -41,8 +40,7 @@ val directory : string (** Get the name of working directory (-C option). *) val includes : string list -(** Get list of include directories (-I option). - These are all absolute paths. *) +(** Get list of include directories (-I option). *) val use_prelude : bool (** True if we should load the prelude, or false if --no-prelude. *) -- 1.8.3.1