diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-09 08:34:48 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-15 09:25:12 (GMT) |
| commit | 8b0e4795687a2ea289d1313db24d75bcf3cd13bc (patch) | |
| tree | d5796df747a09ab3ef7d317606295e45e4df63ab /Source | |
| parent | 88016e2e9f13d60c4a0b88fb64ffd802a2d9e534 (diff) | |
| download | CMake-8b0e4795687a2ea289d1313db24d75bcf3cd13bc.zip CMake-8b0e4795687a2ea289d1313db24d75bcf3cd13bc.tar.gz CMake-8b0e4795687a2ea289d1313db24d75bcf3cd13bc.tar.bz2 | |
cmLocalGenerator: Use the language from the compiler container
This is just to make follow-up diffs smaller.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index a9de948..c405180 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -726,17 +726,18 @@ std::string cmLocalGenerator::ExpandRuleVariable( std::string arg1 = compIt->first + "_ARG1"; compilerArg1 = this->Makefile->GetDefinition(arg1); compilerTarget = this->Makefile->GetDefinition( - std::string("CMAKE_") + lang + "_COMPILER_TARGET"); + std::string("CMAKE_") + compIt->second + "_COMPILER_TARGET"); compilerOptionTarget = this->Makefile->GetDefinition( - std::string("CMAKE_") + lang + "_COMPILE_OPTIONS_TARGET"); + std::string("CMAKE_") + compIt->second + "_COMPILE_OPTIONS_TARGET"); compilerExternalToolchain = this->Makefile->GetDefinition( - std::string("CMAKE_") + lang + "_COMPILER_EXTERNAL_TOOLCHAIN"); - compilerOptionExternalToolchain = - this->Makefile->GetDefinition(std::string("CMAKE_") + lang + - "_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN"); + std::string("CMAKE_") + compIt->second + + "_COMPILER_EXTERNAL_TOOLCHAIN"); + compilerOptionExternalToolchain = this->Makefile->GetDefinition( + std::string("CMAKE_") + compIt->second + + "_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN"); compilerSysroot = this->Makefile->GetDefinition("CMAKE_SYSROOT"); compilerOptionSysroot = this->Makefile->GetDefinition( - std::string("CMAKE_") + lang + "_COMPILE_OPTIONS_SYSROOT"); + std::string("CMAKE_") + compIt->second + "_COMPILE_OPTIONS_SYSROOT"); } if (actualReplace.find("${LANG}") != actualReplace.npos) { cmSystemTools::ReplaceString(actualReplace, "${LANG}", lang); |