diff options
author | Stephen Kelly <steveire@gmail.com> | 2013-08-09 12:28:43 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2013-08-09 12:28:43 (GMT) |
commit | b33c9844fa2c3a6fc7e69688d028bb260582561c (patch) | |
tree | 06369d0a185f7c3a3a9ab050b4ba1812e89a56d8 /Source | |
parent | 702f630db8c7e2225b3be9550a4619a47feba1f6 (diff) | |
download | CMake-b33c9844fa2c3a6fc7e69688d028bb260582561c.zip CMake-b33c9844fa2c3a6fc7e69688d028bb260582561c.tar.gz CMake-b33c9844fa2c3a6fc7e69688d028bb260582561c.tar.bz2 |
Revert "Add compiler target compile options."
This reverts commit 2d9ec1dadfdd10043a98d425abb25d0aef117699.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index b515727..9c04109 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1038,20 +1038,11 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable, // If this is the compiler then look for the extra variable // _COMPILER_ARG1 which must be the first argument to the compiler const char* compilerArg1 = 0; - const char* compilerTarget = 0; - const char* compilerOptionTarget = 0; if(actualReplace == "CMAKE_${LANG}_COMPILER") { std::string arg1 = actualReplace + "_ARG1"; cmSystemTools::ReplaceString(arg1, "${LANG}", lang); compilerArg1 = this->Makefile->GetDefinition(arg1.c_str()); - compilerTarget - = this->Makefile->GetDefinition( - (std::string("CMAKE_") + lang + "_COMPILER_TARGET").c_str()); - compilerOptionTarget - = this->Makefile->GetDefinition( - (std::string("CMAKE_") + lang + - "_COMPILE_OPTION_TARGET").c_str()); } if(actualReplace.find("${LANG}") != actualReplace.npos) { @@ -1072,11 +1063,6 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable, ret += " "; ret += compilerArg1; } - if (compilerTarget && compilerOptionTarget) - { - ret += compilerOptionTarget; - ret += compilerTarget; - } return ret; } return replace; |