diff options
| author | Laszlo Papp <lpapp@kde.org> | 2013-03-18 11:21:38 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-25 23:11:22 +0100 |
| commit | fff8b698ab50d84a9b3e37f087b075ea495b66c9 (patch) | |
| tree | 7205f6bf5620c3e7e602fe2a48c7317087df569a /qmake/generators/unix/unixmake.cpp | |
| parent | a3c802e7e504be00fa5d25893bd967e6b628afc6 (diff) | |
Introduce QMAKE_CC_O_FLAG
This makes it possible to properly parametrize alternative compilers.
Change-Id: Iaf0961c47875ee16d815356f36acf5652577cdca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 4f28321b09..9adcc3af7c 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -256,10 +256,10 @@ UnixMakefileGenerator::init() const ProKey runComp("QMAKE_RUN_" + compiler); if(project->isEmpty(runComp)) - project->values(runComp).append("$(" + compiler + ") " + compile_flag + " -o $obj $src"); + project->values(runComp).append("$(" + compiler + ") " + compile_flag + " " + var("QMAKE_CC_O_FLAG") + "$obj $src"); const ProKey runCompImp("QMAKE_RUN_" + compiler + "_IMP"); if(project->isEmpty(runCompImp)) - project->values(runCompImp).append("$(" + compiler + ") " + compile_flag + " -o \"$@\" \"$<\""); + project->values(runCompImp).append("$(" + compiler + ") " + compile_flag + " " + var("QMAKE_CC_O_FLAG") + "\"$@\" \"$<\""); } if(project->isActiveConfig("macx") && !project->isEmpty("TARGET") && !project->isActiveConfig("compile_libtool") && |