diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2016-07-05 18:22:53 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2016-07-05 18:29:00 +0200 |
| commit | b2dd4dd979577e4f384750872f7f0e7f9bd8df94 (patch) | |
| tree | 613c86859810558ec7127a47fc6469ec207b7ca5 /tools/coqdep_common.ml | |
| parent | 82ed3089485ebe0b722d8505ddbd89d73570b8f9 (diff) | |
Revert "Merge remote-tracking branch 'github/pr/229' into trunk"
This reverts commit b2f8f9edd5c1bb0a9c8c4f4b049381b979d3e385, reversing
changes made to da99355b4d6de31aec5a660f7afe100190a8e683.
Hugo asked for more discussion on this topic, and it was not in the roadmap. I
merged it prematurely because I thought there was a consensus. Also, I missed
that it was changing coq_makefile. Sorry about that.
Diffstat (limited to 'tools/coqdep_common.ml')
| -rw-r--r-- | tools/coqdep_common.ml | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/tools/coqdep_common.ml b/tools/coqdep_common.ml index 8bf7fee4b..cc63c13d7 100644 --- a/tools/coqdep_common.ml +++ b/tools/coqdep_common.ml @@ -15,7 +15,7 @@ open Minisys behavior is the one of [coqdep -boot]. Its only dependencies are [Coqdep_lexer], [Unix] and [Minisys], and it should stay so. If it need someday some additional information, pass it via - options (see for instance [option_dynlink] below). + options (see for instance [option_natdynlk] below). *) module StrSet = Set.Make(String) @@ -26,11 +26,9 @@ module StrListMap = Map.Make(StrList) let stderr = Pervasives.stderr let stdout = Pervasives.stdout -type dynlink = Opt | Byte | Both | No | Variable - let option_c = ref false let option_noglob = ref false -let option_dynlink = ref Both +let option_natdynlk = ref true let option_boot = ref false let option_mldep = ref None @@ -382,16 +380,10 @@ let rec traite_fichier_Coq suffixe verbose f = end) strl | Declare sl -> let declare suff dir s = - let base = escape (file_name s dir) in - match !option_dynlink with - | No -> () - | Byte -> printf " %s%s" base suff - | Opt -> printf " %s.cmxs" base - | Both -> printf " %s%s %s.cmxs" base suff base - | Variable -> - printf " %s%s" base - (if suff=".cmo" then "$(DYNOBJ)" else "$(DYNLIB)") - in + let base = file_name s dir in + let opt = if !option_natdynlk then " "^base^".cmxs" else "" in + printf " %s%s%s" (escape base) suff opt + in let decl str = let s = basename_noext str in if not (StrSet.mem s !deja_vu_ml) then begin |