summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2023-03-10 14:56:01 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2023-03-10 14:56:33 +0100
commitfc8a2e123444834a8e48e2b8076e112d4b1155cb (patch)
tree89a03a36f023da84c3c0d835251b78a0a3cf5f70
parent786ac9676dd2c9909f5d32e7206ee3474ab40eb8 (diff)
downloadjustbuild-fc8a2e123444834a8e48e2b8076e112d4b1155cb.tar.gz
just-mr: fix launcher forwarding
A local launcher should be forwarded, if it is different to the default launcher (which is ["env", "--"]); in particular, an explictly empy launcher should be forwarded.
-rw-r--r--src/other_tools/just_mr/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/other_tools/just_mr/main.cpp b/src/other_tools/just_mr/main.cpp
index 70eaee3c..bedda552 100644
--- a/src/other_tools/just_mr/main.cpp
+++ b/src/other_tools/just_mr/main.cpp
@@ -1286,7 +1286,7 @@ void DefaultReachableRepositories(
cmd.emplace_back(*arguments.common.just_mr_paths->root);
}
if (use_launcher and arguments.common.local_launcher and
- not arguments.common.local_launcher->empty()) {
+ (arguments.common.local_launcher != kDefaultLauncher)) {
cmd.emplace_back("--local-launcher");
cmd.emplace_back(
nlohmann::json(*arguments.common.local_launcher).dump());