diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-03 15:17:50 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-03 15:17:50 +0000 |
| commit | f2523be58f4546b530ab03ece3a9dd1183f4deec (patch) | |
| tree | df4debaf02c1d953264ff2b9490c6c47e55facc4 | |
| parent | 618c64aa88755d61b734ba8b54a325a56ac830ad (diff) | |
| download | vcxsrv-f2523be58f4546b530ab03ece3a9dd1183f4deec.tar.gz vcxsrv-f2523be58f4546b530ab03ece3a9dd1183f4deec.tar.bz2 vcxsrv-f2523be58f4546b530ab03ece3a9dd1183f4deec.zip | |
Solved possible build error when having rules with multiple targets
| -rw-r--r-- | tools/mhmake/src/commandqueue.cpp | 12 | ||||
| -rw-r--r-- | tools/mhmake/src/util.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tools/mhmake/src/commandqueue.cpp b/tools/mhmake/src/commandqueue.cpp index 306142d2b..ba1a7d073 100644 --- a/tools/mhmake/src/commandqueue.cpp +++ b/tools/mhmake/src/commandqueue.cpp @@ -344,7 +344,17 @@ mh_time_t commandqueue::WaitForTarget(const refptr<fileinfo> &pTarget) {
// There should still be active entries, otherwise this is a serious bug
if (!m_NrActiveEntries && !Return)
- throw("Fatal error: WaitForTarget "+pTarget->GetQuotedFullFileName()+": no active targets anymore.");
+ {
+ // This may happen when having multiple target rules and pTarget was build when on of the other targets
+ // was build. so first check if the pTarget was not build in the mean time. If so, this is not an error
+ if (pTarget->IsBuild())
+ {
+ Return=true;
+ break;
+ }
+ else
+ throw("Fatal error: WaitForTarget "+pTarget->GetQuotedFullFileName()+": no active targets anymore.");
+ }
else
break;
}
diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h index aff7d642a..5afe9aecf 100644 --- a/tools/mhmake/src/util.h +++ b/tools/mhmake/src/util.h @@ -50,7 +50,7 @@ #define PLATFORM "linux"
#endif
-#define MHMAKEVER "2.2.1"
+#define MHMAKEVER "2.2.2"
class makecommand
{
|