summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2020-07-26 16:28:09 +0900
committerOBATA Akio <obache@wizdas.com>2020-07-26 16:28:09 +0900
commit141af55cca0bad0492786479584e474b3285ab9b (patch)
tree7b4a0a90b40f8ecba9e6dd9c442d0570127a466c
parent5449d37d879866e4193dded434382a71b33e0be2 (diff)
downloadtqt3-141af55c.tar.gz
tqt3-141af55c.zip
Fix to set libtool special mode-args as a compiler flag
Signed-off-by: OBATA Akio <obache@wizdas.com>
-rw-r--r--qmake/generators/unix/unixmake.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index a9952afd..1f97210d 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";
}