From b2dd4dd979577e4f384750872f7f0e7f9bd8df94 Mon Sep 17 00:00:00 2001 From: Maxime Dénès Date: Tue, 5 Jul 2016 18:22:53 +0200 Subject: 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. --- tools/coqdep_boot.ml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tools/coqdep_boot.ml') diff --git a/tools/coqdep_boot.ml b/tools/coqdep_boot.ml index 25f62d2be..6fc826833 100644 --- a/tools/coqdep_boot.ml +++ b/tools/coqdep_boot.ml @@ -16,11 +16,7 @@ open Coqdep_common *) let rec parse = function - | "-dyndep" :: "no" :: ll -> option_dynlink := No; parse ll - | "-dyndep" :: "opt" :: ll -> option_dynlink := Opt; parse ll - | "-dyndep" :: "byte" :: ll -> option_dynlink := Byte; parse ll - | "-dyndep" :: "both" :: ll -> option_dynlink := Both; parse ll - | "-dyndep" :: "var" :: ll -> option_dynlink := Variable; parse ll + | "-natdynlink" :: "no" :: ll -> option_natdynlk := false; parse ll | "-c" :: ll -> option_c := true; parse ll | "-boot" :: ll -> parse ll (* We're already in boot mode by default *) | "-mldep" :: ocamldep :: ll -> -- cgit v1.2.3