diff options
| author | tono <tono@openoffice.org> | 2010-01-24 18:56:44 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-01-24 18:56:44 +0900 |
| commit | eba2cc51bb1521685b1cfcdac7027c5e9b8ee22e (patch) | |
| tree | d821ac882c2645f953207533fe1401ce2feefbf8 /set_soenv.in | |
| parent | 3406b75aaec59100b015b9bcd2efe303f2a2f78b (diff) | |
i#108617: Set COMPATH to real cygwin root in mingw build using cygwin
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 4 |
1 files changed, 3 insertions, 1 deletions
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; |