diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-07-25 17:57:19 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-08-02 17:59:45 +0900 |
| commit | 4140dfe51e5ee099dc89c08b883296174407bf83 (patch) | |
| tree | d91a5b7d6dd1fc0969ebdd9575d6489580f82579 /qmake/generators/unix/unixmake2.cpp | |
| parent | ed71e397ed3267d0d917e7e470c0702142947f5e (diff) | |
| download | tqt-4140dfe51e5ee099dc89c08b883296174407bf83.tar.gz tqt-4140dfe51e5ee099dc89c08b883296174407bf83.zip | |
Fix to set `old_library` in libtool file only for `staticlib` project
Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 12dcb88d29d09f1f913b88832db5b7fa01088939)
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 867ae9d8e..dd96aba75 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; |