summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2017-09-19 01:20:04 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-09-19 03:22:38 +0200
commitbef91f7e5f3121dced360d4b90a09c334f12e56e (patch)
treeb8b768d1f0c7f3e6e456f46a838a8f4e7fa04931 /solenv
parent7d5245848c28f5786258476cd7aa2a4523645de3 (diff)
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>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gcc-wrappers/wrapper.cxx2
1 files changed, 1 insertions, 1 deletions
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:")) {