Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 166b459eaa3a
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f35c2af3fee8
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 17, 2016

  1. reword missing ocaml-crunch slightly so that it points to the missing… 

    … ocaml package
    @hannesm
    hannesm committed Oct 17, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5fdb9e7 View commit details

Commits on Oct 18, 2016

  1. make automatically defines $(LD)! For solo5 use ld provided by backend 

    This is needed on FreeBSD where $(LD) is /usr/bin/ld, which is GNU ld 2.17.50,
and does not work with the solo5 linker script.  /usr/local/bin/ld from ports
does work, though!
    @hannesm
    hannesm committed Oct 18, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6cf2267 View commit details

  2. Merge pull request #623 from hannesm/minor 

    reword missing ocaml-crunch slightly; use LD from pkg-config for virtio
    @hannesm
    hannesm authored Oct 18, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f35c2af View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 lib/mirage.ml
6 changes: 4 additions & 2 deletions lib/mirage.ml
View file
Original file line number Diff line number Diff line change
@@ -237,7 +237,7 @@ let crunch dirname = impl @@ object

method configure i =
if not (Cmd.exists "ocaml-crunch") then
Log.error "ocaml-crunch not found, stopping."
Log.error "Couldn't find the ocaml-crunch binary. Please install the opam package crunch."
else begin
let dir = Info.root i / dirname in
let file = Info.root i / (name ^ ".ml") in
@@ -1489,13 +1489,15 @@ 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