diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-03-10 12:05:08 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-03-10 13:41:15 +0100 |
| commit | 786ac9676dd2c9909f5d32e7206ee3474ab40eb8 (patch) | |
| tree | b0cd4e64d8bc050de9ea01d23124439f6a01c3bc /src/buildtool/common/cli.hpp | |
| parent | d763d3668d285c2b9a5f0095dea68d483d7cff70 (diff) | |
| download | justbuild-786ac9676dd2c9909f5d32e7206ee3474ab40eb8.tar.gz | |
Move common defaults for just and just-mr into a separate library
... and, in this way, avoid duplication of these constants that
might lead to inconsistencies between those two tools later.
Diffstat (limited to 'src/buildtool/common/cli.hpp')
| -rw-r--r-- | src/buildtool/common/cli.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buildtool/common/cli.hpp b/src/buildtool/common/cli.hpp index 5590534a..5a7c5882 100644 --- a/src/buildtool/common/cli.hpp +++ b/src/buildtool/common/cli.hpp @@ -27,10 +27,10 @@ #include "gsl-lite/gsl-lite.hpp" #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/evaluator.hpp" +#include "src/buildtool/common/clidefaults.hpp" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/logging/log_level.hpp" -constexpr auto kDefaultLogLevel = LogLevel::Progress; constexpr auto kDefaultTimeout = std::chrono::milliseconds{300000}; /// \brief Arguments common to all commands. @@ -377,7 +377,7 @@ static inline auto SetupCommonBuildArguments( "JSON array with the list of strings representing the launcher to " "prepend actions' commands before being executed locally.") ->type_name("JSON") - ->default_val(nlohmann::json{"env", "--"}.dump()); + ->default_val(nlohmann::json(kDefaultLauncher).dump()); } static inline auto SetupBuildArguments( |