diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-10-11 11:26:50 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-10-11 11:26:50 +0200 |
| commit | 4f4f453c79eb5992ef1fa28d8ce5abe29c995169 (patch) | |
| tree | ed5959dd310404a069cd4391d4da01a27caba917 /tools | |
| parent | 35c36f80dcc1e61e3dae8bcce1da71b384904582 (diff) | |
| parent | 8330c0b1da55a29d0b23dc452f4749be52cc3e8e (diff) | |
Merge PR #1143: fix coq_makefile on cygwin
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 4a9d871fd..2feaaa04c 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -122,7 +122,8 @@ let generate_makefile oc conf_file local_file args project = Envars.coqlib () ^ template in let s = read_whole_file makefile_template in let s = List.fold_left - (fun s (k,v) -> Str.global_replace (Str.regexp_string k) v s) s + (* We use global_substitute to avoid running into backslash issues due to \1 etc. *) + (fun s (k,v) -> Str.global_substitute (Str.regexp_string k) (fun _ -> v) s) s [ "@CONF_FILE@", conf_file; "@LOCAL_FILE@", local_file; "@COQ_VERSION@", Coq_config.version; |