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/cmMakefileLibraryTargetGenerator.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/cmMakefileLibraryTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 8e25f43..5db5c24 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -352,18 +352,6 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( commands, buildEcho, cmLocalUnixMakefileGenerator3::EchoLink, &progress); } - const char* forbiddenFlagVar = CM_NULLPTR; - switch (this->GeneratorTarget->GetType()) { - case cmState::SHARED_LIBRARY: - forbiddenFlagVar = "_CREATE_SHARED_LIBRARY_FORBIDDEN_FLAGS"; - break; - case cmState::MODULE_LIBRARY: - forbiddenFlagVar = "_CREATE_SHARED_MODULE_FORBIDDEN_FLAGS"; - break; - default: - break; - } - // Clean files associated with this library. std::vector<std::string> libCleanFiles; libCleanFiles.push_back(this->LocalGenerator->MaybeConvertToRelativePath( @@ -585,11 +573,6 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( this->LocalGenerator->AddArchitectureFlags( langFlags, this->GeneratorTarget, linkLanguage, this->ConfigName); - // remove any language flags that might not work with the - // particular os - if (forbiddenFlagVar) { - this->RemoveForbiddenFlags(forbiddenFlagVar, linkLanguage, langFlags); - } vars.LanguageCompileFlags = langFlags.c_str(); // Construct the main link rule and expand placeholders. |