diff options
| author | Enrico Tassi | 2017-05-11 15:53:16 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2017-05-23 10:48:28 +0200 |
| commit | 7b56ef80850af8ddf13db35b4cd69f6cf1af3549 (patch) | |
| tree | 7a67bdf353d687292da576fcbc44f9e9887d03dc | |
| parent | 8bec0d32f038819de0503d9045daefcf1e253d49 (diff) | |
coq_makefile: don't quote extra arguments (-arg)
Restores compatibility with 8.6
| -rw-r--r-- | test-suite/coq-makefile/arg/_CoqProject | 11 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/arg/run.sh | 9 | ||||
| -rw-r--r-- | tools/coq_makefile.ml | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/test-suite/coq-makefile/arg/_CoqProject b/test-suite/coq-makefile/arg/_CoqProject new file mode 100644 index 0000000000..afdb32e7cf --- /dev/null +++ b/test-suite/coq-makefile/arg/_CoqProject @@ -0,0 +1,11 @@ +-R theories test +-R src test +-I src +-arg "-compat 8.4" + +src/test_plugin.mlpack +src/test.ml4 +src/test.mli +src/test_aux.ml +src/test_aux.mli +theories/test.v diff --git a/test-suite/coq-makefile/arg/run.sh b/test-suite/coq-makefile/arg/run.sh new file mode 100755 index 0000000000..28b9bcb969 --- /dev/null +++ b/test-suite/coq-makefile/arg/run.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +#set -x +set -e + +. ../template/init.sh + +coq_makefile -f _CoqProject -o Makefile +make diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 39dccaddee..78c92e68b5 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -257,7 +257,7 @@ let generate_conf_defs oc { defs; extra_args } = section oc "Extra variables."; List.iter (fun (k,v) -> Printf.fprintf oc "%s = %s\n" k v) defs; Printf.fprintf oc "COQMF_OTHERFLAGS = %s\n" - (String.concat " " (List.map quote extra_args)) + (String.concat " " extra_args) let generate_conf oc project args = fprintf oc "# This configuration file was generated by running:\n"; |