[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-7' - solenv/gcc-wrappers

[Michael Stahl]

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

New commits:
commit b2c9319c508b340694017b1458ab5feb4d948585
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Apr 18 22:02:23 2015 +0200

    tdf#82430: gcc-wrappers: command line *must* start with a space
    
    Yes, you read that right, if there's no space in front of the first
    argument, cl.exe will *ignore* it.
    
    Change-Id: I73d9bf026705538e53b5d91091a4c96eb15739b2
    (cherry picked from commit c4a267215c10647ff281e9e629faa0a8a201f4b4)
    Reviewed-on: https://gerrit.libreoffice.org/15382
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 2c3f7421d550b6ae8c6bfdcde709dfba57aa1d3a)
    Reviewed-on: https://gerrit.libreoffice.org/15436
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 585a7df..5fc7c40 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -184,6 +184,11 @@ int startprocess(string command, string args) {
         command=command.substr(0,pos+strlen("ccache"))+".exe";
     }
 
+    if (args[0] != ' ')
+    {
+        args.insert(0, " "); // lpCommandLine *must* start with space!
+    }
+
     //cerr << "CMD= " << command << " " << args << endl;
 
     // Commandline may be modified by CreateProcess