diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-07-26 16:28:09 +0900 | 
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2020-08-02 18:00:00 +0900 | 
| commit | 72977948b9a307f99c8b8290ec5b27ee57faef83 (patch) | |
| tree | 786c2691ec72dd9a74714206217555a092a1a2ba /qmake/generators/unix | |
| parent | e1cdcbaf453207ef785ee2f291dead42a694e587 (diff) | |
| download | tqt-72977948b9a307f99c8b8290ec5b27ee57faef83.tar.gz tqt-72977948b9a307f99c8b8290ec5b27ee57faef83.zip  | |
Fix to set libtool special mode-args as a compiler flag
Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 141af55cca0bad0492786479584e474b3285ab9b)
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 2cb2ec9d4..d21beba55 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";  		}  | 
