summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2020-07-25 17:57:19 +0900
committerOBATA Akio <obache@wizdas.com>2020-07-25 17:57:19 +0900
commit12dcb88d29d09f1f913b88832db5b7fa01088939 (patch)
tree473a028b39adbe0739b816fbcbeae47799510af7
parente6ce806b771adc9d963d760dfac46b2c62a57798 (diff)
downloadtqt3-12dcb88d.tar.gz
tqt3-12dcb88d.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 56e3b8de..b6cf6421 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";
TQStringList libs;