You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2017/08/15 09:16:55 UTC

svn commit: r1805063 - /openoffice/trunk/main/solenv/gbuild/processdeps.awk

Author: truckman
Date: Tue Aug 15 09:16:55 2017
New Revision: 1805063

URL: http://svn.apache.org/viewvc?rev=1805063&view=rev
Log:
Strip carriage return characters from the output of MSVC in "make depend"
mode so that these characters don't get appended to the file names in
the dependency files.  This breaks all the gbuild modules because gmake
thinks the file names have ^M appended to them and can't find them.

Modified:
    openoffice/trunk/main/solenv/gbuild/processdeps.awk

Modified: openoffice/trunk/main/solenv/gbuild/processdeps.awk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/processdeps.awk?rev=1805063&r1=1805062&r2=1805063&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/processdeps.awk (original)
+++ openoffice/trunk/main/solenv/gbuild/processdeps.awk Tue Aug 15 09:16:55 2017
@@ -40,6 +40,7 @@
 
 function mangle_path(path) {
     gsub("\\\\", "/", path);
+    gsub("\r", "", path);
     if( path ~ /^[a-zA-Z]:/ )
         path = tolower(substr(path,0,1)) substr(path,2);
     gsub(WORKDIR, "$(WORKDIR)/", path);