diff options
author | John Hodge <tpg@mutabah.net> | 2017-08-28 13:42:10 +0800 |
---|---|---|
committer | John Hodge <tpg@mutabah.net> | 2017-08-31 16:31:24 +0800 |
commit | 4e9adae0c15e163290426db1c7d1956abc4c56f5 (patch) | |
tree | 348ef3c4f4044a6381d974fd4bd038cb5df90506 /tools/minicargo/main.cpp | |
parent | 773c7e17fea5b6f43357a5ed125ba0cdd82ac72d (diff) | |
download | mrust-4e9adae0c15e163290426db1c7d1956abc4c56f5.tar.gz |
minicargo - Only load build script deps wehn override not active
Diffstat (limited to 'tools/minicargo/main.cpp')
-rw-r--r-- | tools/minicargo/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/minicargo/main.cpp b/tools/minicargo/main.cpp index 2c1188c8..a00e3192 100644 --- a/tools/minicargo/main.cpp +++ b/tools/minicargo/main.cpp @@ -46,15 +46,17 @@ int main(int argc, const char* argv[]) repo.load_vendored(opts.vendor_dir); } + auto bs_override_dir = opts.override_directory ? ::helpers::path(opts.override_directory) : ::helpers::path(); + // 1. Load the Cargo.toml file from the passed directory auto dir = ::helpers::path(opts.directory ? opts.directory : "."); auto m = PackageManifest::load_from_toml( dir / "Cargo.toml" ); // 2. Load all dependencies - m.load_dependencies(repo); + m.load_dependencies(repo, !bs_override_dir.is_valid()); // 3. Build dependency tree and build program. - MiniCargo_Build(m, opts.override_directory ? ::helpers::path(opts.override_directory) : ::helpers::path() ); + MiniCargo_Build(m, bs_override_dir ); } catch(const ::std::exception& e) { |