diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-10-09 08:58:33 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2016-10-09 08:58:33 (GMT) |
commit | d0faa58a51114a97f3af6a951b6c4052ca19c9ee (patch) | |
tree | f5c49fc88b7324ce0345b96a32478fbaf9c6bf47 /Source/cmMakefileTargetGenerator.cxx | |
parent | 785bfae867de0ad18463d618d45b4ae8c2712934 (diff) | |
download | CMake-d0faa58a51114a97f3af6a951b6c4052ca19c9ee.zip CMake-d0faa58a51114a97f3af6a951b6c4052ca19c9ee.tar.gz CMake-d0faa58a51114a97f3af6a951b6c4052ca19c9ee.tar.bz2 |
Makefiles: Remove forbidden flag logic
This might have been needed some day in the past, but not anymore.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 14102ef..d256a69 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1416,52 +1416,6 @@ void cmMakefileTargetGenerator::CloseFileStreams() delete this->FlagFileStream; } -void cmMakefileTargetGenerator::RemoveForbiddenFlags( - const char* flagVar, const std::string& linkLang, std::string& linkFlags) -{ - // check for language flags that are not allowed at link time, and - // remove them, -w on darwin for gcc -w -dynamiclib sends -w to libtool - // which fails, there may be more] - - std::string removeFlags = "CMAKE_"; - removeFlags += linkLang; - removeFlags += flagVar; - std::string removeflags = this->Makefile->GetSafeDefinition(removeFlags); - std::vector<std::string> removeList; - cmSystemTools::ExpandListArgument(removeflags, removeList); - - for (std::vector<std::string>::iterator i = removeList.begin(); - i != removeList.end(); ++i) { - std::string tmp; - std::string::size_type lastPosition = 0; - - for (;;) { - std::string::size_type position = linkFlags.find(*i, lastPosition); - - if (position == std::string::npos) { - tmp += linkFlags.substr(lastPosition); - break; - } else { - std::string::size_type prefixLength = position - lastPosition; - tmp += linkFlags.substr(lastPosition, prefixLength); - lastPosition = position + i->length(); - - bool validFlagStart = - position == 0 || isspace(linkFlags[position - 1]); - - bool validFlagEnd = - lastPosition == linkFlags.size() || isspace(linkFlags[lastPosition]); - - if (!validFlagStart || !validFlagEnd) { - tmp += *i; - } - } - } - - linkFlags = tmp; - } -} - void cmMakefileTargetGenerator::CreateLinkScript( const char* name, std::vector<std::string> const& link_commands, std::vector<std::string>& makefile_commands, |