summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2018-08-04 15:36:30 +0800
committerJohn Hodge <tpg@mutabah.net>2018-08-04 15:36:30 +0800
commit2d3ca13d000f392cca8bf17cf8969c96e80aa786 (patch)
treeb3b8e312a86c3d494c9988bf667efb3da1bc81f0
parentcd56b774f425b0c842556c3ddeeba708b0fe309f (diff)
downloadmrust-2d3ca13d000f392cca8bf17cf8969c96e80aa786.tar.gz
Minicargo - Always print called processes
-rw-r--r--tools/minicargo/build.cpp32
1 files changed, 25 insertions, 7 deletions
diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp
index ea93a793..2f8fafe4 100644
--- a/tools/minicargo/build.cpp
+++ b/tools/minicargo/build.cpp
@@ -940,10 +940,18 @@ bool Builder::spawn_process(const char* exe_name, const StringList& args, const
::std::stringstream cmdline;
cmdline << exe_name;
for (const auto& arg : args.get_vec())
+ // TODO: Escaping
cmdline << " " << arg;
auto cmdline_str = cmdline.str();
- DEBUG("Calling " << cmdline_str);
-
+ if(true)
+ {
+ ::std::cout << "> " << cmdline_str << ::std::end;;
+ }
+ else
+ {
+ DEBUG("Calling " << cmdline_str);
+ }
+
#if 0
// TODO: Determine required minimal environment, to avoid importing the entire caller environment
::std::stringstream environ_str;
@@ -1005,12 +1013,22 @@ bool Builder::spawn_process(const char* exe_name, const StringList& args, const
// Generate `argv`
auto argv = args.get_vec();
argv.insert(argv.begin(), exe_name);
- //DEBUG("Calling " << argv);
- Debug_Print([&](auto& os){
- os << "Calling";
+
+ if(true)
+ {
+ ::std::cout << ">";
for(const auto& p : argv)
- os << " " << p;
- });
+ ::std::cout << " " << p;
+ ::std::cout << ::std::endl;
+ }
+ else
+ {
+ Debug_Print([&](auto& os){
+ os << "Calling";
+ for(const auto& p : argv)
+ os << " " << p;
+ });
+ }
DEBUG("Environment " << env);
argv.push_back(nullptr);