Commit 9436353f authored by Stephen Kelly's avatar Stephen Kelly
Browse files

Genex: Always return immediately on error.

parent 20a06d01
...@@ -354,6 +354,7 @@ static const struct CCompilerIdNode : public CompilerIdNode ...@@ -354,6 +354,7 @@ static const struct CCompilerIdNode : public CompilerIdNode
reportError(context, content->GetOriginalExpression(), reportError(context, content->GetOriginalExpression(),
"$<C_COMPILER_ID> may only be used with targets. It may not " "$<C_COMPILER_ID> may only be used with targets. It may not "
"be used with add_custom_command."); "be used with add_custom_command.");
return std::string();
} }
return this->EvaluateWithLanguage(parameters, context, content, return this->EvaluateWithLanguage(parameters, context, content,
dagChecker, "C"); dagChecker, "C");
...@@ -381,6 +382,7 @@ static const struct CXXCompilerIdNode : public CompilerIdNode ...@@ -381,6 +382,7 @@ static const struct CXXCompilerIdNode : public CompilerIdNode
reportError(context, content->GetOriginalExpression(), reportError(context, content->GetOriginalExpression(),
"$<CXX_COMPILER_ID> may only be used with targets. It may not " "$<CXX_COMPILER_ID> may only be used with targets. It may not "
"be used with add_custom_command."); "be used with add_custom_command.");
return std::string();
} }
return this->EvaluateWithLanguage(parameters, context, content, return this->EvaluateWithLanguage(parameters, context, content,
dagChecker, "CXX"); dagChecker, "CXX");
...@@ -448,6 +450,7 @@ static const struct CCompilerVersionNode : public CompilerVersionNode ...@@ -448,6 +450,7 @@ static const struct CCompilerVersionNode : public CompilerVersionNode
reportError(context, content->GetOriginalExpression(), reportError(context, content->GetOriginalExpression(),
"$<C_COMPILER_VERSION> may only be used with targets. It may not " "$<C_COMPILER_VERSION> may only be used with targets. It may not "
"be used with add_custom_command."); "be used with add_custom_command.");
return std::string();
} }
return this->EvaluateWithLanguage(parameters, context, content, return this->EvaluateWithLanguage(parameters, context, content,
dagChecker, "C"); dagChecker, "C");
...@@ -476,6 +479,7 @@ static const struct CxxCompilerVersionNode : public CompilerVersionNode ...@@ -476,6 +479,7 @@ static const struct CxxCompilerVersionNode : public CompilerVersionNode
reportError(context, content->GetOriginalExpression(), reportError(context, content->GetOriginalExpression(),
"$<CXX_COMPILER_VERSION> may only be used with targets. It may " "$<CXX_COMPILER_VERSION> may only be used with targets. It may "
"not be used with add_custom_command."); "not be used with add_custom_command.");
return std::string();
} }
return this->EvaluateWithLanguage(parameters, context, content, return this->EvaluateWithLanguage(parameters, context, content,
dagChecker, "CXX"); dagChecker, "CXX");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment