Browse Source

comments, and change how --verbose prints

feature/dependency-graph
Martin Dørum 4 years ago
parent
commit
862cb6baf0
2 changed files with 8 additions and 2 deletions
  1. 1
    1
      src/sys.cc
  2. 7
    1
      src/toolchain.cc

+ 1
- 1
src/sys.cc View File

if (global::verbose) { if (global::verbose) {
for (size_t i = 0; i < args.size(); ++i) { for (size_t i = 0; i < args.size(); ++i) {
if (i == 0) { if (i == 0) {
fprintf(stderr, "%s", args[i]);
fprintf(stderr, " %s", args[i]);
} else { } else {
fprintf(stderr, " %s", args[i]); fprintf(stderr, " %s", args[i]);
} }

+ 7
- 1
src/toolchain.cc View File

argv.push_back(pkg.c_str()); argv.push_back(pkg.c_str());
} }


// Execute $(PKG_CONFIG) --cflags $(PKGS)
std::string output; std::string output;
sys::execute(argv, &output); sys::execute(argv, &output);
parseWhitespaceSeparated(output, flags); parseWhitespaceSeparated(output, flags);
argv.push_back(pkg.c_str()); argv.push_back(pkg.c_str());
} }


// Execute $(PKG_CONFIG) --libs $(PKGS)
std::string output; std::string output;
sys::execute(argv, &output); sys::execute(argv, &output);
parseWhitespaceSeparated(output, flags); parseWhitespaceSeparated(output, flags);
} }


argv.push_back("-MM"); argv.push_back("-MM");
argv.push_back("-c");
argv.push_back(sourcePath.c_str()); argv.push_back(sourcePath.c_str());

// Execute $(CC) $(flags) -MM $<
std::string output; std::string output;
sys::execute(argv, &output); sys::execute(argv, &output);


std::string destDir = outDir + "/" + srcDir; std::string destDir = outDir + "/" + srcDir;
std::string destPath = destDir + "/" + name + ".o"; std::string destPath = destDir + "/" + name + ".o";


// Ensure the output directory actually exists
sys::mkdirp(outDir); sys::mkdirp(outDir);


std::vector<const char *> argv; std::vector<const char *> argv;
argv.push_back(destPath.c_str()); argv.push_back(destPath.c_str());
argv.push_back("-c"); argv.push_back("-c");
argv.push_back(sourcePath.c_str()); argv.push_back(sourcePath.c_str());

// Execute $(CC) $(flags) -o $@ -c $<
sys::execute(argv, nullptr); sys::execute(argv, nullptr);
} }



Loading…
Cancel
Save