[buck] fix no-inline arguments order when doing a query

Summary:
D25495343 (72a59553d2) mistakenly removed a rev_append and replaced it with @.
Fix that and rename the variable so that it's clearer it needs to be reversed.

Reviewed By: skcho

Differential Revision: D25558030

fbshipit-source-id: c66f477f2
master
Nikos Gorogiannis 4 years ago committed by Facebook GitHub Bot
parent 212068f89b
commit ea321b42a2

@ -684,7 +684,7 @@ and buck_build_args =
$(b,--buck-clang)."
and buck_build_args_no_inline =
and buck_build_args_no_inline_rev =
CLOpt.mk_string_list ~long:"Xbuck-no-inline"
~in_help:InferCommand.[(Capture, manual_buck)]
"Pass values as command-line arguments to invocations of $(i,`buck build`), don't inline any \
@ -2736,7 +2736,7 @@ and buck_blacklist = !buck_blacklist
and buck_build_args = !buck_build_args
and buck_build_args_no_inline = !buck_build_args_no_inline
and buck_build_args_no_inline_rev = !buck_build_args_no_inline_rev
and buck_cache_mode = (!buck || !genrule_mode) && not !debug

@ -178,7 +178,7 @@ val buck_blacklist : string list
val buck_build_args : string list
val buck_build_args_no_inline : string list
val buck_build_args_no_inline_rev : string list
val buck_cache_mode : bool

@ -295,7 +295,9 @@ module Query = struct
let bounded_args =
store_args_in_file ~identifier:"buck_query_args" (buck_config @ buck_output_options @ [query])
in
let cmd = ["buck"; "query"] @ Config.buck_build_args_no_inline @ bounded_args in
let cmd =
"buck" :: "query" :: List.rev_append Config.buck_build_args_no_inline_rev bounded_args
in
wrap_buck_call ~label:"query" cmd |> parse_query_output ?buck_mode
end

@ -115,7 +115,7 @@ let capture build_cmd =
let all_args = List.rev_append rev_not_targets targets in
let updated_buck_cmd =
command
:: List.rev_append Config.buck_build_args_no_inline
:: List.rev_append Config.buck_build_args_no_inline_rev
(Buck.store_args_in_file ~identifier:"clang_flavor_build" all_args)
in
L.debug Capture Quiet "Processed buck command '%a'@\n" (Pp.seq F.pp_print_string)

@ -170,7 +170,7 @@ let capture buck_mode build_cmd =
let updated_buck_cmd =
(* make buck tell us where in buck-out are the capture directories for merging *)
(prog :: command :: "--build-report" :: build_report_file :: Buck.config buck_mode)
@ List.rev_append Config.buck_build_args_no_inline
@ List.rev_append Config.buck_build_args_no_inline_rev
(Buck.store_args_in_file ~identifier:"genrule_build" all_args)
in
L.(debug Capture Quiet)

@ -25,7 +25,7 @@ let capture build_cmd =
let updated_buck_cmd =
(* make buck tell us where in buck-out are the capture directories for merging *)
(prog :: command :: "--build-report" :: build_report_file :: Buck.config JavaFlavor)
@ List.rev_append Config.buck_build_args_no_inline
@ List.rev_append Config.buck_build_args_no_inline_rev
(Buck.store_args_in_file ~identifier:"java_flavor_build" all_args)
in
L.(debug Capture Quiet)

@ -83,7 +83,7 @@ let get_compilation_database_files_buck db_deps ~prog ~args =
| {command= "build" as command; rev_not_targets; targets} ->
let targets_args = Buck.store_args_in_file ~identifier:"compdb_build_args" targets in
let build_args =
(command :: List.rev_append rev_not_targets (List.rev Config.buck_build_args_no_inline))
(command :: List.rev_append rev_not_targets (List.rev Config.buck_build_args_no_inline_rev))
@ (* Infer doesn't support C++ modules nor precompiled headers yet (T35656509) *)
"--config" :: "*//cxx.pch_enabled=false" :: "--config" :: "*//cxx.modules_default=false"
:: "--config" :: "*//cxx.modules=False" :: targets_args
@ -95,7 +95,7 @@ let get_compilation_database_files_buck db_deps ~prog ~args =
prog :: "targets"
:: List.rev_append
(Buck.filter_compatible `Targets rev_not_targets)
(List.rev Config.buck_build_args_no_inline)
(List.rev Config.buck_build_args_no_inline_rev)
@ ("--show-output" :: targets_args)
in
let on_target_lines = function

Loading…
Cancel
Save