summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2020-07-25 17:57:19 +0900
committerSlávek Banko <slavek.banko@axis.cz>2021-02-02 01:43:12 +0100
commit4596513c452688719d01cb2f5f7e1b81140f9f93 (patch)
tree22e8441c845190e1c49daef46d58705dd26bbb09
parent5c32919647732d0e20dc08ad4a8d24193238174f (diff)
downloadqt3-4596513c452688719d01cb2f5f7e1b81140f9f93.tar.gz
qt3-4596513c452688719d01cb2f5f7e1b81140f9f93.zip
Fix to set `old_library` in libtool file only for `staticlib` project
Signed-off-by: OBATA Akio <obache@wizdas.com>
-rw-r--r--qmake/generators/unix/unixmake2.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 496f080..734b009 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1471,7 +1471,11 @@ UnixMakefileGenerator::writeLibtoolFile()
t << "'\n\n";
t << "# The name of the static archive.\n"
- << "old_library='" << lname.left(lname.length()-Option::libtool_ext.length()) << ".a'\n\n";
+ << "old_library='";
+ if(project->isActiveConfig("staticlib")) {
+ t << lname.left(lname.length()-Option::libtool_ext.length()) << ".a";
+ }
+ t << "'\n\n";
t << "# Libraries that this one depends upon.\n";
QStringList libs;