diff options
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index bc2ca57..a8561c0 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -335,6 +335,10 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, outputRuntime = false; } + // Some search paths should never be emitted + emitted.insert(""); + emitted.insert("/usr/lib"); + // collect all the flags needed for linking libraries std::string linkLibs; std::vector<std::string>& libdirs = m_Makefile->GetLinkDirectories(); @@ -352,10 +356,6 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, emitted.insert(libpath); } } - if(libpath == "/usr/lib" ) - { - emitted.insert(libpath); - } if(emitted.insert(libpath).second) { std::string::size_type pos = libDir->find("-L"); @@ -395,17 +395,14 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout, cmSystemTools::SplitProgramPath(lib->first.c_str(), dir, file); std::string libpath = cmSystemTools::EscapeSpaces(dir.c_str()); - if(libpath != "/usr/lib") + if(emitted.insert(libpath).second) { - if(emitted.insert(libpath).second) + linkLibs += "-L"; + linkLibs += libpath; + linkLibs += " "; + if(outputRuntime) { - linkLibs += "-L"; - linkLibs += libpath; - linkLibs += " "; - if(outputRuntime) - { - runtimeDirs.push_back( libpath ); - } + runtimeDirs.push_back( libpath ); } } cmRegularExpression libname("lib(.*)\\.(.*)"); |