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: 9be9b6160842
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: afa469a33408
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 14, 2016

  1. emit a target-specific ocamlfind predicate

    @pqwy
    pqwy committed Aug 14, 2016
    Copy the full SHA
    c3495be View commit details

Commits on Aug 18, 2016

  1. Merge pull request #568 from pqwy/prediquery 

    Emit an ocamlfind predicate that matches the target
    @yomimono
    yomimono authored Aug 18, 2016
    Copy the full SHA
    afa469a View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 lib/mirage.ml
5 changes: 4 additions & 1 deletion lib/mirage.ml
View file
Original file line number Diff line number Diff line change
@@ -1454,9 +1454,12 @@ let configure_makefile ~target ~root ~name ~warn_error info =
append fmt "SYNTAX = -tags \"thread,%s\"\n" default_tags;
append fmt "FLAGS = -r -cflag -g -lflags -g,-linkpkg\n"
end;
append fmt "TAGS = \"predicate(%s)\""
(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 $(LIBS) $(SYNTAX) $(FLAGS)\n\
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\