diff options
| author | Maxime Dénès | 2015-01-15 13:44:42 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2015-01-15 13:44:42 +0100 |
| commit | 17b127167f82d5c8ebf998f0c6d946870c1322aa (patch) | |
| tree | 2b1ce15cb1ec87c444e99e3af4390d02da1f1778 /tools | |
| parent | 25ff4164eff11d09c1147a8174f5714d3a31bbd3 (diff) | |
| parent | 93fa642fa5e4134d034a1f10fe6dffa4a36182cf (diff) | |
Merge branch 'v8.5' into trunk
Conflicts:
tools/coq_makefile.ml
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coq_makefile.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index 28b86ddc78..e9bdb6caca 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -503,9 +503,9 @@ let parameters () = print "$(call includecmdwithout@,$(COQBIN)coqtop -config)\n\n"; print "TIMED=\nTIMECMD=\nSTDTIME?=/usr/bin/time -f \"$* (user: %U mem: %M ko)\"\n"; print "TIMER=$(if $(TIMED), $(STDTIME), $(TIMECMD))\n\n"; - print "vo_to_obj = $(addsuffix .o,$(foreach vo,$(1),\\\n"; - print " $(addprefix $(dir $(vo)),$(addprefix .coq-native/,$(filter-out Warning: Error:,$(firstword \\\n"; - print " $(shell $(COQBIN)coqtop -q -noinit -batch -quiet -print-mod-uid $(vo))))))))\n\n" + print "vo_to_obj = $(addsuffix .o,\\\n"; + print " $(filter-out Warning: Error:,\\\n"; + print " $(shell $(COQBIN)coqtop -q -noinit -batch -quiet -print-mod-uid $(1))))\n\n" let include_dirs (inc_ml,inc_i,inc_r) = let parse_ml_includes l = List.map (fun (x,_) -> "-I \"" ^ x ^ "\"") l in |