From ff6c5b70ceadeb50979791056031f5fc8f36455b Mon Sep 17 00:00:00 2001 From: Gabriel Scherer Date: Sat, 11 Apr 2015 17:40:26 +0000 Subject: [PATCH] fix PR#6809: make PR#6794 (ocamlbuild uses ocamlfind's C flags) trunk-only The change broke current Oasis, so we reverted it from 4.02 and included it only in trunk -- oasis should get fixed before 4.03. git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15992 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- Changes | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 90f6669f7..1f02b9b47 100644 --- a/Changes +++ b/Changes @@ -67,6 +67,10 @@ Toplevel and debugger: (Peter Zotov and Jake Donham, review by Gabriel Scherer and Jacques-Henri Jourdan) +OCamlbuild: +- PR#6794, PR#6809: pass package-specific include flags when building C files + (Jérémie Dimino, request by Peter Zotov) + Bug fixes: * PR#4539: change exception string raised when comparing functional values (Nicolas Braud-Santoni, report by Eric Cooper) @@ -149,8 +153,6 @@ OCamlbuild: (Peter Zotov, Gabriel Scherer) - PR#6774: new menhir-specific flags "only_tokens" and "external_tokens(Foo)" (François Pottier) -- PR#6794: pass package-specific include flags when building C files - (Jérémie Dimino, request by Peter Zotov) Tools: - PR#6641: add -g, -ocamlcflags, -ocamloptflags options to ocamlmklib