diff options
| author | Enrico Tassi | 2014-02-28 16:34:12 +0100 |
|---|---|---|
| committer | Enrico Tassi | 2014-02-28 16:34:12 +0100 |
| commit | 293746e7d709436a8e0ec94b8eb2e972ac0efde6 (patch) | |
| tree | d2096ae852a946c13b7fcb936959b998dbbe841d /tools | |
| parent | 1995076f64d860d472d882d7d0442f66a07f015c (diff) | |
Fix compilation of coq and plugins using coq_makefile under cygwin
Problems:
- strip may not be "strip" but "i686-bla-strip", hence we ask ocamlc -config
the value of "ranlinb" and replace ranlib by strip obtaining
"i686-bla-strip" from "i686-bla-ranlib"
- coq_makefile was not quoting the plugins/ paths
- coq_makefile was quoting twice camlpX (the shell of cygwin was confused)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 37a3e8062a..3eae68ff8a 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -409,7 +409,7 @@ let variables is_install opt (args,defs) = -I \"$(COQLIB)proofs\" -I \"$(COQLIB)tactics\" -I \"$(COQLIB)tools\" \\ -I \"$(COQLIB)toplevel\" -I \"$(COQLIB)grammar\""; List.iter (fun c -> print " \\ - -I $(COQLIB)/"; print c) Coq_config.plugins_dirs; print "\n"; + -I \"$(COQLIB)/"; print c; print "\"") Coq_config.plugins_dirs; print "\n"; print "ZFLAGS=$(OCAMLLIBS) $(COQSRCLIBS) -I $(CAMLP4LIB)\n\n"; print "CAMLC?=$(OCAMLC) -c -rectypes\n"; print "CAMLOPTC?=$(OCAMLOPT) -c -rectypes\n"; @@ -421,7 +421,7 @@ CAMLP4EXTEND=pa_extend.cmo q_MLast.cmo pa_macro.cmo else CAMLP4EXTEND= endif\n"; - print "PP?=-pp '\"$(CAMLP4O)\" -I \"$(CAMLLIB)\" -I . $(COQSRCLIBS) compat5.cmo \\ + print "PP?=-pp '$(CAMLP4O) -I $(CAMLLIB) -I . $(COQSRCLIBS) compat5.cmo \\ $(CAMLP4EXTEND) $(GRAMMARS) $(CAMLP4OPTIONS) -impl'\n\n"; end; match is_install with |