From 51a65325e78d337880e6876df58906bd94d0bb9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Mon, 16 Nov 2020 19:03:35 +0100 Subject: [PATCH] No warning for vendor dirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulysse Gérard --- src/dune_rules/foreign_rules.ml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dune_rules/foreign_rules.ml b/src/dune_rules/foreign_rules.ml index 8e5917d16033..1fa574b68a1d 100644 --- a/src/dune_rules/foreign_rules.ml +++ b/src/dune_rules/foreign_rules.ml @@ -100,10 +100,15 @@ let build_c ~kind ~sctx ~dir ~expander ~include_flags (loc, src, dst) = [dune-project] file (thus defaulting to [true]) and the [:standard] set of flags has been overriden *) let has_standard = Ordered_set_lang.Unexpanded.has_standard flags in + let is_vendored = + match Path.Build.drop_build_context dir with + | Some src_dir -> Dune_engine.File_tree.is_vendored src_dir + | None -> false + in if Dune_project.dune_version project >= (2, 8) && Option.is_none (Dune_project.future_c_and_cxx_flags_handling project) - && not has_standard + && (not is_vendored) && not has_standard then User_warning.emit ~loc [ Pp.text