diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 218d197..3363362 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -154,7 +154,8 @@ void cmUnixMakefileGenerator::OutputMakefile(const char* file) std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories(); for(j = libdirs.begin(); j != libdirs.end(); ++j) { - if((*j).find("-L") == std::string::npos + std::string::size_type pos = (*j).find("-L"); + if((pos == std::string::npos || pos > 0) && (*j).find("${") == std::string::npos) { linkLibs += "-L"; @@ -165,7 +166,8 @@ void cmUnixMakefileGenerator::OutputMakefile(const char* file) std::vector<std::string>& libs = m_Makefile->GetLinkLibraries(); for(j = libs.begin(); j != libs.end(); ++j) { - if((*j).find("-l") == std::string::npos + std::string::size_type pos = (*j).find("-l"); + if((pos == std::string::npos || pos > 0) && (*j).find("${") == std::string::npos) { linkLibs += "-l"; |