summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2020-07-26 16:28:09 +0900
committerSlávek Banko <slavek.banko@axis.cz>2021-02-02 01:45:16 +0100
commit20597c412f924c698b1b0232a5787934ad42dc87 (patch)
treee0c9633d1259d0f662915bf6e693c7026c055ddd
parentac08552d14091ea8633f5bae86d72d5ef964e32e (diff)
downloadqt3-20597c412f924c698b1b0232a5787934ad42dc87.tar.gz
qt3-20597c412f924c698b1b0232a5787934ad42dc87.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 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";
}