diff options
| author | Maxime Dénès | 2017-11-27 16:45:03 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2017-11-27 16:45:03 +0100 |
| commit | 86cada15ad12e31b1f9fe6f0b7026860f45671b4 (patch) | |
| tree | 00815df07b0e6d0e8367b98b2db3a5863129bc69 /configure.ml | |
| parent | 4774a3129f4175b0b97d538a1c61eb084332fd85 (diff) | |
| parent | f36ea3ffb4ef01572db437392174f10650bee67b (diff) | |
Merge PR #6041: Protecting the printing of filenames with space
Diffstat (limited to 'configure.ml')
| -rw-r--r-- | configure.ml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ml b/configure.ml index 86f6b7fe38..1ccb691067 100644 --- a/configure.ml +++ b/configure.ml @@ -973,6 +973,8 @@ let config_runtime () = let vmbyteflags = config_runtime () +let esc s = if String.contains s ' ' then "\"" ^ s ^ "\"" else s + (** * Summary of the configuration *) let print_summary () = @@ -985,16 +987,16 @@ let print_summary () = pr " Other bytecode link flags : %s\n" custom_flag; pr " OS dependent libraries : %s\n" osdeplibs; pr " OCaml version : %s\n" caml_version; - pr " OCaml binaries in : %s\n" camlbin; - pr " OCaml library in : %s\n" camllib; + pr " OCaml binaries in : %s\n" (esc camlbin); + pr " OCaml library in : %s\n" (esc camllib); pr " OCaml flambda flags : %s\n" (String.concat " " !Prefs.flambda_flags); pr " %s version : %s\n" capitalized_camlpX camlpX_version; - pr " %s binaries in : %s\n" capitalized_camlpX camlpXbindir; - pr " %s library in : %s\n" capitalized_camlpX camlpXlibdir; + pr " %s binaries in : %s\n" capitalized_camlpX (esc camlpXbindir); + pr " %s library in : %s\n" capitalized_camlpX (esc camlpXlibdir); if best_compiler = "opt" then pr " Native dynamic link support : %B\n" hasnatdynlink; if coqide <> "no" then - pr " Lablgtk2 library in : %s\n" !lablgtkdir; + pr " Lablgtk2 library in : %s\n" (esc !lablgtkdir); if !idearchdef = "QUARTZ" then pr " Mac OS integration is on\n"; pr " CoqIde : %s\n" coqide; @@ -1009,7 +1011,7 @@ let print_summary () = else (pr " Paths for true installation:\n"; List.iter - (fun (_,msg,dir,_) -> pr " - %s will be copied in %s\n" msg dir) + (fun (_,msg,dir,_) -> pr " - %s will be copied in %s\n" msg (esc dir)) install_dirs); pr "\n"; pr "If anything is wrong above, please restart './configure'.\n\n"; |