fix after rebase

Signed-off-by: Hugo Heuzard <hugo.heuzard@gmail.com>

Author: hhugo

src/dune_rules/exe_rules.ml

@@ -173,10 +173,15 @@ let executables_rules ~sctx ~dir ~expander ~dir_contents ~scope ~compile_info
        files directly to improve perf. *)
     let link_deps, sandbox = Dep_conf_eval.unnamed ~expander exes.link_deps in
     let link_args =
+      let use_standard_c_and_cxx_flags =
+        match Dune_project.use_standard_c_and_cxx_flags project with
+        | Some true -> Buildable.has_foreign_cxx exes.buildable
+        | _ -> false
+      in
       let open Action_builder.O in
       let link_flags =
         link_deps
-        >>> Super_context.link_flags sctx ~dir ~expander ~flags:exes.link_flags
+        >>> Super_context.link_flags sctx ~dir ~expander ~use_standard_c_and_cxx_flags ~flags:exes.link_flags
       in
       let+ flags = link_flags
       and+ ctypes_cclib_flags =

src/dune_rules/super_context.ml

@@ -402,15 +402,18 @@ let foreign_flags t ~dir ~expander ~flags ~language =
   in
   Action_builder.memoize (sprintf "%s flags" name) flags
 
-let link_flags t ~dir ~expander ~flags =
-  let t = t.env_tree in
+let link_flags t ~dir ~expander ~use_standard_c_and_cxx_flags ~flags =
+  let env_tree = t.env_tree in
   let default_from_env =
-    get_node t ~dir >>| Env_node.link_flags |> Action_builder.memo_build_join
+    get_node env_tree ~dir >>| Env_node.link_flags |> Action_builder.memo_build_join
   in
   let default_extra =
-    let open Action_builder.O in
-    let+flags = Cxx_flags.get_flags ~for_:Link dir in
-    List.concat_map flags ~f:(fun f -> [ "-cclib"; f ])
+    if use_standard_c_and_cxx_flags
+    then 
+      let open Action_builder.O in
+      let+flags = Cxx_flags.get_flags ~for_:Link dir in
+      List.concat_map flags ~f:(fun f -> [ "-cclib"; f ])
+    else Action_builder.return []
   in
   let default =
     let open Action_builder.O in

src/dune_rules/super_context.mli

@@ -90,6 +90,7 @@ val link_flags :
      t
   -> dir:Path.Build.t
   -> expander:Expander.t
+  -> use_standard_c_and_cxx_flags:bool
   -> flags:Ordered_set_lang.Unexpanded.t
   -> string list Action_builder.t