Commit fd4c762b authored by Julien Lopez's avatar Julien Lopez
Browse files

[MINOR] install_lib is now always compiling native code

	Add --bytecode option for configure
parent 1a63a8b2
......@@ -109,8 +109,10 @@ install_bin:
$(HIDE)mkdir -p $(BINDIR)
$(HIDE)$(INSTALL) -m755 $(INSTALL_BINARIES) $(BINDIR)/
install_lib:
install_lib: all
install_lib:
$(HIDE)$(MAKE) NATIVE=true all
@echo "Build META"
$(HIDE)(sed "s/%REQ%/$(PACKAGES)/" < META.in | sed "s/%VER%/$(VERSION)/" > META)
$(HIDE)-$(OCAMLFIND) remove cduce
......
......@@ -17,6 +17,7 @@ Defaults for the options are specified in brackets.
Options:
--help display this help and exit
--bytecode compile CDuce in bytecode instead of native
Optional features:
--with-FEATURE force support for FEATURE [default: autodetect]
......@@ -69,9 +70,10 @@ let vars =
"htmldir", ref "";
"sessiondir", ref "/tmp/cduce_sessions";
"mliface", ref ""
"mliface", ref "";
]
let native = ref true
let src_dirs = ["/usr/src"; "/usr/local/src"; "/tmp"]
......@@ -96,6 +98,7 @@ let start_with s p =
let parse_arg s =
if s = "--help" then (usage (); exit 0)
else if s = "--bytecode" then native := false
else
match start_with s "--with-" with
| Some f -> (List.assoc f features) := `yes
......@@ -135,7 +138,7 @@ let check_feature f p =
else (print "disabled\n"; false)
let native =
check_feature "ocamlopt" (fun () -> command "ocamlfind ocamlopt")
check_feature "ocamlopt" (fun () -> command "ocamlfind ocamlopt") && !native
let check_pkg p () =
try
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment