[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - solenv/gcc-wrappers

[Michael Stahl]

 solenv/gcc-wrappers/wrapper.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 513b7d3b854727564e9424d9b6b861df630131ac
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 8 12:34:59 2018 +0100

    gcc-wrappers: recognise -ggdb.* in addition to -g as debug flag
    
    Firebird uses -ggdb.  This causes it to have 2 PDB files, however
    this isn't sufficient to make BinScope happy, more investigation
    needed.
    
    (cherry picked from commit d6b91568d22b9019ddf098f3c3072de25eb1c268)
    
    gcc-wrappers: always pass -debug to linker
    ... like gbuild does; this causes a PDB file to be created, which
    is required by BinScope.  Stops complaints about firebird's DLLs,
    which are apparently the only DLLs linked with gcc-wrapper.
    (cherry picked from commit 471b844915cc3d7036cb0fd88b40eeb049f5b54d)
    
    Change-Id: I5286964586eaffea36790ab7a7ca2df75d85f068
    Reviewed-on: https://gerrit.libreoffice.org/47586
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 800687ad65a6..b156c89dc220 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -97,7 +97,8 @@ string processccargs(vector<string> rawargs) {
 
     // apparently these must be at the end
     // otherwise configure tests may fail
-    string linkargs(" -link");
+    // note: always use -debug so a PDB file is created
+    string linkargs(" -link -debug");
 
     for(vector<string>::iterator i = rawargs.begin(); i != rawargs.end(); ++i) {
         args.append(" ");
@@ -127,7 +128,7 @@ string processccargs(vector<string> rawargs) {
                 exit(1);
             }
         }
-        else if(*i == "-g") {
+        else if(*i == "-g" || !(*i).compare(0,5,"-ggdb")) {
             args.append("-Zi");
             args.append(" -FS");
         }