kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ninja: Restructure code to work with the Borland compilers 

Should fix the Borland dashboard errors.
This commit is contained in:
David Cole 2012-06-14 13:39:39 -04:00
parent 69bc5131b2
commit 555bda4e43
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -391,12 +391,18 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
// Compute architecture specific link flags. Yes, these go into a different // Compute architecture specific link flags. Yes, these go into a different
// variable for executables, probably due to a mistake made when duplicating // variable for executables, probably due to a mistake made when duplicating
// code between the Makefile executable and library generators. // code between the Makefile executable and library generators.
locGtor->AddArchitectureFlags(targetType == cmTarget::EXECUTABLE std::string flags = (targetType == cmTarget::EXECUTABLE
? vars["FLAGS"] ? vars["FLAGS"]
: vars["ARCH_FLAGS"], : vars["ARCH_FLAGS"]);
locGtor->AddArchitectureFlags(flags,
this->GetTarget(), this->GetTarget(),
this->TargetLinkLanguage, this->TargetLinkLanguage,
this->GetConfigName()); this->GetConfigName());
if (targetType == cmTarget::EXECUTABLE) {
vars["FLAGS"] = flags;
} else {
vars["ARCH_FLAGS"] = flags;
}
if (this->GetTarget()->HasSOName(this->GetConfigName())) { if (this->GetTarget()->HasSOName(this->GetConfigName())) {
vars["SONAME_FLAG"] = vars["SONAME_FLAG"] =
this->GetMakefile()->GetSONameFlag(this->TargetLinkLanguage); this->GetMakefile()->GetSONameFlag(this->TargetLinkLanguage);