diff options
| author | John Hodge <tpg@ucc.asn.au> | 2017-11-18 11:22:29 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2017-11-18 17:47:12 +0800 |
| commit | a7cf23f5b4e78cf30e23312d49a6db0217def79e (patch) | |
| tree | 0fdf8d1f07ca98a61521abafad9f163a7bed960b | |
| parent | 23fd6a01638a315b5ea815f4fa0eb4e5296a5693 (diff) | |
| download | mrust-a7cf23f5b4e78cf30e23312d49a6db0217def79e.tar.gz | |
minicargo - Allow skipping of compiler as a dependency
| -rw-r--r-- | tools/minicargo/build.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/minicargo/build.cpp b/tools/minicargo/build.cpp index f5f9a652..04feb7e6 100644 --- a/tools/minicargo/build.cpp +++ b/tools/minicargo/build.cpp @@ -398,7 +398,7 @@ bool Builder::build_target(const PackageManifest& manifest, const PackageTarget& // Rebuild (missing) DEBUG("Building " << outfile << " - Missing"); } - else if( ts_result < this->get_timestamp(m_compiler_path) /*|| ts_result < this->get_timestamp("bin/minicargo")*/ ) { + else if( !getenv("MINICARGO_IGNTOOLS") && ( ts_result < this->get_timestamp(m_compiler_path) /*|| ts_result < this->get_timestamp("bin/minicargo")*/ ) ) { // Rebuild (older than mrustc/minicargo) DEBUG("Building " << outfile << " - Older than mrustc ( " << ts_result << " < " << this->get_timestamp(m_compiler_path) << ")"); } @@ -547,7 +547,7 @@ bool Builder::build_library(const PackageManifest& manifest) const if( ts_result == Timestamp::infinite_past() ) { DEBUG("Building " << out_file << " - Missing"); } - else if( ts_result < this->get_timestamp(m_compiler_path) /*|| ts_result < this->get_timestamp("bin/minicargo")*/ ) { + else if( !getenv("MINICARGO_IGNTOOLS") && (ts_result < this->get_timestamp(m_compiler_path) /*|| ts_result < this->get_timestamp("bin/minicargo")*/) ) { // Rebuild (older than mrustc/minicargo) DEBUG("Building " << out_file << " - Older than mrustc ( " << ts_result << " < " << this->get_timestamp(m_compiler_path) << ")"); } |