diff options
| author | OBATA Akio <[email protected]> | 2020-07-25 17:57:19 +0900 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2021-02-02 01:43:25 +0100 |
| commit | 76d31ef3835a2c8cdffd7bfeac460caf86216aca (patch) | |
| tree | 98898a87cd55ec813cfc165249d0018dfa64d965 | |
| parent | 6da58c88045502a19f7f5ea54fca0bf079afff26 (diff) | |
| download | qt3-76d31ef3835a2c8cdffd7bfeac460caf86216aca.tar.gz qt3-76d31ef3835a2c8cdffd7bfeac460caf86216aca.zip | |
Fix to set `old_library` in libtool file only for `staticlib` project
Signed-off-by: OBATA Akio <[email protected]>
(cherry picked from commit 4596513c452688719d01cb2f5f7e1b81140f9f93)
| -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 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; |