[Libreoffice-commits] core.git: solenv/gcc-wrappers

[Peter Foley]

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

New commits:
commit c8c19de5c0df85a31ceb5454da351ed13076e048
Author: Peter Foley <pefol...@verizon.net>
Date:   Sat Mar 23 20:09:16 2013 -0400

    fix liborcus on windows
    
    Change-Id: I852b4e159f818854fd2ac5bdcd14343b2a628134

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 2b2f233..a768eef 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -103,7 +103,7 @@ string processccargs(vector<string> rawargs) {
             args.append("-link -LIBPATH:"+(*i).substr(2));
         }
         else if(!(*i).compare(0,2,"-l")) {
-            args.append((*i).substr(2)+"lib.lib");
+            args.append((*i).substr(2)+".lib");
         }
         else if(!(*i).compare(0,12,"-fvisibility")) {
             //TODO: drop other gcc-specific options
@@ -132,7 +132,7 @@ int startprocess(string command, string args) {
     sa.bInheritHandle=TRUE;
 
     if(!CreatePipe(&childout_read,&childout_write,&sa,0)) {
-        cerr << "Error: could not create sdtout pipe" << endl;
+        cerr << "Error: could not create stdout pipe" << endl;
         exit(1);
     }
 
@@ -141,6 +141,7 @@ int startprocess(string command, string args) {
     si.hStdOutput=childout_write;
     si.hStdError=childout_write;
 
+    // support ccache
     size_t pos=command.find("ccache ");
     if(pos != string::npos) {
         args.insert(0,"cl.exe");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits