[buck] always merge tenvs regardless of mode

Summary:
We cannot necessarily know if the previous capture phase was java or
clang, hence to be on the safe side we should always merge the global
tenvs when merging Buck targets.

Reviewed By: ngorogiannis

Differential Revision: D19175685

fbshipit-source-id: 8e7492e14

infer/src/backend/mergeCapture.ml

@@ -60,9 +60,8 @@ let merge_captured_targets () =
   L.progress "Merging captured Buck targets...@\n%!" ;
   let infer_deps_file = Config.(results_dir ^/ buck_infer_deps_file_name) in
   DBWriter.merge ~infer_deps_file ;
-  if Config.genrule_master_mode then
-    ScubaLogging.execute_with_time_logging "merge_captured_tenvs" (fun () ->
-        merge_global_tenvs infer_deps_file ) ;
+  ScubaLogging.execute_with_time_logging "merge_captured_tenvs" (fun () ->
+      merge_global_tenvs infer_deps_file ) ;
   let targets_num =
     let counter = ref 0 in
     let incr_counter _line = incr counter in