From bef91f7e5f3121dced360d4b90a09c334f12e56e Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Tue, 19 Sep 2017 01:20:04 +0200
Subject: gpg4libre: have gcc-wrapper handle linking properly

Change-Id: I83305f504f7d492195f07f11f06d2c9855d92400
Reviewed-on: https://gerrit.libreoffice.org/42441
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
---
 solenv/gcc-wrappers/wrapper.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 6e3fe1393fdb..800687ad65a6 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -142,7 +142,7 @@ string processccargs(vector<string> rawargs) {
         else if(!(*i).compare(0,2,"-L")) {
             linkargs.append(" -LIBPATH:"+(*i).substr(2));
         }
-        else if(!(*i).compare(0,2,"-l")) {
+        else if(!(*i).compare(0,2,"-l") && (*i).compare(0,5,"-link")) {
             linkargs.append(" "+(*i).substr(2)+".lib");
         }
         else if(!(*i).compare(0,5,"-def:") || !(*i).compare(0,5,"/def:")) {
-- 
cgit