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 | |
| 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.
| -rw-r--r-- | Modules/CMakeDetermineCompilerABI.cmake | 3 | ||||
| -rw-r--r-- | Modules/Compiler/Clang.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/QNX.cmake | 3 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 14 |
4 files changed, 0 insertions, 21 deletions
diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index e9ae995..5d35ce3 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -28,9 +28,6 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) if(DEFINED CMAKE_${lang}_VERBOSE_FLAG) set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}") endif() - if(CMAKE_${lang}_COMPILER_TARGET) - set(CMAKE_FLAGS "${CMAKE_FLAGS} -DCMAKE_${lang}_COMPILER_TARGET=${CMAKE_${lang}_COMPILER_TARGET}") - endif() try_compile(CMAKE_${lang}_ABI_COMPILED ${CMAKE_BINARY_DIR} ${src} CMAKE_FLAGS "${CMAKE_FLAGS}" diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake index 66b00bd..ec4562a 100644 --- a/Modules/Compiler/Clang.cmake +++ b/Modules/Compiler/Clang.cmake @@ -25,5 +25,4 @@ macro(__compiler_clang lang) set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE") set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=") - set(CMAKE_${lang}_COMPILE_OPTION_TARGET "-target ") endmacro() diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake index 315f721..2598411 100644 --- a/Modules/Platform/QNX.cmake +++ b/Modules/Platform/QNX.cmake @@ -13,9 +13,6 @@ set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -# http://www.qnx.com/developers/docs/6.4.0/neutrino/utilities/q/qcc.html#examples -set(CMAKE_C_COMPILE_OPTION_TARGET "-V") -set(CMAKE_CXX_COMPILE_OPTION_TARGET "-V") # Shared libraries with no builtin soname may not be linked safely by # specifying the file path. 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; |