Revert "reword missing ocaml-crunch slightly; use LD from pkg-config …

…for virtio"
mirage · Oct 19, 2016 · 62f7beb · 62f7beb
1 parent f35c2af
commit 62f7beb
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/mirage.ml b/lib/mirage.ml
@@ -237,7 +237,7 @@ let crunch dirname = impl @@ object
 
     method configure i =
       if not (Cmd.exists "ocaml-crunch") then
-        Log.error "Couldn't find the ocaml-crunch binary.  Please install the opam package crunch."
+        Log.error "ocaml-crunch not found, stopping."
       else begin
         let dir = Info.root i / dirname in
         let file = Info.root i / (name ^ ".ml") in
@@ -1489,15 +1489,13 @@ let configure_makefile ~target ~root ~name ~warn_error info =
     (match target with
       `Unix | `MacOSX -> "unix" | `Xen -> "xen" | `Virtio | `Ukvm -> "solo5" );
   append fmt "SYNTAX += -tag-line \"<static*.*>: warn(-32-34)\"\n";
+  append fmt "LD?=ld";
   append fmt "BUILD  = ocamlbuild -use-ocamlfind -tags $(TAGS) $(LIBS) $(SYNTAX) $(FLAGS)\n\
               OPAM   = opam\n\n\
               export PKG_CONFIG_PATH=$(shell opam config var prefix)\
               /lib/pkgconfig\n\n\
               export OPAMVERBOSE=1\n\
               export OPAMYES=1";
-  (match target with
-   | `Virtio | `Ukvm -> append fmt "LD=$(shell pkg-config solo5-kernel-virtio --variable=ld)"
-   | _ -> ());
   newline fmt;
   let pkg_config_deps =
     match target with