fix after rebase

Signed-off-by: Hugo Heuzard <[email protected]>

src/dune_rules/super_context.ml

@@ -404,23 +404,17 @@ let foreign_flags t ~dir ~expander ~flags ~language =
 
 let link_flags t ~dir ~expander ~use_standard_c_and_cxx_flags ~flags =
   let env_tree = t.env_tree in
-  let default_from_env =
+  let default =
     get_node env_tree ~dir >>| Env_node.link_flags |> Action_builder.memo_build_join
   in
-  let default_extra =
+  let default =
     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
-    let+ default_from_env = default_from_env
-    and+ default_extra = default_extra
-    in
-    default_from_env @ default_extra
+      let+ default = default
+      and+ flags = Cxx_flags.get_flags ~for_:Link dir in
+      default @ List.concat_map flags ~f:(fun f -> [ "-cclib"; f ])
+    else default 
   in
   Action_builder.memoize "link flags"
     (Expander.expand_and_eval_set expander flags ~standard:default)