diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-07-26 16:28:09 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-02 01:45:31 +0100 |
| commit | 6948355c1b3f5344580418a48e571a3130d02ae7 (patch) | |
| tree | 3bb031f5113260a538bc128e4c94f023770a5fdc | |
| parent | 1bb4825b204794f7bae84b410effec3ec0999280 (diff) | |
| download | qt3-6948355c1b3f5344580418a48e571a3130d02ae7.tar.gz qt3-6948355c1b3f5344580418a48e571a3130d02ae7.zip | |
Fix to set libtool special mode-args as a compiler flag
Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 20597c412f924c698b1b0232a5787934ad42dc87)
| -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 34cefaa..c70eba9 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -343,7 +343,7 @@ UnixMakefileGenerator::init() if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") { libtool_flags += " --mode=link"; if(project->isActiveConfig("staticlib")) { - libtool_flags += " -static"; + comp_flags += " -static"; } else { if(!project->isEmpty("QMAKE_LIB_FLAG")) { int maj = project->first("VER_MAJ").toInt(); @@ -363,7 +363,7 @@ UnixMakefileGenerator::init() } } if(project->isActiveConfig("plugin")) - libtool_flags += " -module"; + comp_flags += " -module"; } else { libtool_flags += " --mode=compile"; } |