From eba2cc51bb1521685b1cfcdac7027c5e9b8ee22e Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Sun, 24 Jan 2010 18:56:44 +0900
Subject: i#108617: Set COMPATH to real cygwin root in mingw build using cygwin

---
 set_soenv.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'set_soenv.in')

diff --git a/set_soenv.in b/set_soenv.in
index 4d3e41383a38..6fab4fe6bc7f 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -593,7 +593,6 @@ elsif ( $platform =~ m/osf1/ )
 } 
 elsif ( $platform =~ m/cygwin/ ) 
 {
-      $COMPATH        = PathFormat('@COMPATH@');
       $MSPDB_PATH     = PathFormat('@MSPDB_PATH@');
       $MIDL_PATH      = PathFormat('@MIDL_PATH@');
       $CSC_PATH       = PathFormat('@CSC_PATH@');
@@ -618,6 +617,8 @@ elsif ( $platform =~ m/cygwin/ )
       $FLIPCMD        = "slfl.pl";
       $PATH_SEPERATOR = ';';
       $outfile        = "winmingw.set"; 
+      $COMPATH        = PathFormat('@COMPATH@/bin');
+      $COMPATH        =~ s/\/bin$//i;
       $COM            = "GCC";
       $CVER           = "C341";
       $OUTPATH        = "wntgcci";
@@ -626,6 +627,7 @@ elsif ( $platform =~ m/cygwin/ )
   }
   else # The MSVC section starts here
   {   $outfile        = "winenv.set";
+      $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci@COMEX@";
       $INPATH         = $OUTPATH.$PROEXT;
-- 
cgit