diff options
| -rw-r--r-- | Modules/Platform/gcc.cmake | 8 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 4 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Modules/Platform/gcc.cmake b/Modules/Platform/gcc.cmake index be09e37..149ecfe 100644 --- a/Modules/Platform/gcc.cmake +++ b/Modules/Platform/gcc.cmake @@ -4,8 +4,8 @@ IF(CMAKE_COMPILER_IS_GNUCC) SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") - SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -o <PREPROCESSED_SOURCE> -E <SOURCE>") - SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -o <ASSEMBLY_SOURCE> -S <SOURCE>") + SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") + SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") ENDIF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCXX) @@ -14,7 +14,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") - SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -o <PREPROCESSED_SOURCE> -E <SOURCE>") - SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -o <ASSEMBLY_SOURCE> -S <SOURCE>") + SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") + SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") ENDIF(CMAKE_COMPILER_IS_GNUCXX) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 94cbdf1..0640e0d 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -306,13 +306,13 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile() { this->WriteObjectConvenienceRule( ruleFileStream, "target to preprocess a source file", - (base + ".E").c_str(), lo->second); + (base + ".i").c_str(), lo->second); } if(do_assembly_rules) { this->WriteObjectConvenienceRule( ruleFileStream, "target to generate assembly for a file", - (base + ".S").c_str(), lo->second); + (base + ".s").c_str(), lo->second); } } } diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index c85a981..ae65daa 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -509,12 +509,12 @@ cmMakefileTargetGenerator if(do_preprocess_rules) { commands.clear(); - std::string relativeObjE = relativeObjBase + ".E"; + std::string relativeObjI = relativeObjBase + ".i"; std::string preprocessEcho = "Preprocessing "; preprocessEcho += lang; preprocessEcho += " source to "; - preprocessEcho += relativeObjE; + preprocessEcho += relativeObjI; this->LocalGenerator->AppendEcho( commands, preprocessEcho.c_str(), cmLocalUnixMakefileGenerator3::EchoBuild @@ -528,7 +528,7 @@ cmMakefileTargetGenerator { cmSystemTools::ExpandListArgument(preprocessRule, commands); - vars.PreprocessedSource = relativeObjE.c_str(); + vars.PreprocessedSource = relativeObjI.c_str(); // Expand placeholders in the commands. for(std::vector<std::string>::iterator i = commands.begin(); @@ -545,14 +545,14 @@ cmMakefileTargetGenerator } this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, - relativeObjE.c_str(), + relativeObjI.c_str(), force_depends, commands, false); } if(do_assembly_rules) { commands.clear(); - std::string relativeObjS = relativeObjBase + ".S"; + std::string relativeObjS = relativeObjBase + ".s"; std::string assemblyEcho = "Compiling "; assemblyEcho += lang; |