aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorletouzey2012-08-23 12:52:47 +0000
committerletouzey2012-08-23 12:52:47 +0000
commit492ad5ad0b4c55610c9896436d2165ac22b527a6 (patch)
tree87bd525d8baadaa9177fa8f9a7b8e886a17c06a2 /scripts
parentbe746c0bbd22d9a4206216a242a6f968b4f9135f (diff)
No more coqtop.opt, produce directly a coqtop binary
We now always produce two binaries, coqtop and coqtop.byte : - If ocamlopt is available, coqtop is directly what used to be coqtop.opt, no more symlinks needed. - Otherwise, coqtop is a copy of coqtop.byte. The same for coqchk and coqide... git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15752 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'scripts')
-rw-r--r--scripts/coqc.ml6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/coqc.ml b/scripts/coqc.ml
index 5a0c0623ca..0a3938ae13 100644
--- a/scripts/coqc.ml
+++ b/scripts/coqc.ml
@@ -22,8 +22,7 @@
let environment = Unix.environment ()
-let best = if Coq_config.arch = "win32" then "" else ("."^Coq_config.best)
-let binary = ref ("coqtop" ^ best)
+let binary = ref "coqtop"
let image = ref ""
(* coqc options *)
@@ -110,8 +109,7 @@ let parse_args () =
usage ()
| "-byte" :: rem ->
binary := "coqtop.byte"; parse (cfiles,args) rem
- | "-opt" :: rem ->
- binary := "coqtop.opt"; parse (cfiles,args) rem
+ | "-opt" :: rem -> (* now a no-op *) parse (cfiles,args) rem
| "-libdir" :: _ :: rem ->
print_string "Warning: option -libdir deprecated and ignored\n"; flush stdout;
parse (cfiles,args) rem