Author: truckman
Date: Sun Jan 7 19:51:56 2018
New Revision: 1820483
URL: http://svn.apache.org/viewvc?rev=1820483&view=rev
Log:
Use $CC_PATH (with the trailing slash removed) instead of $COMPATH
when setting $PATH. The latter has the trailing /bin removed from
the path to the compiler executable and results in /usr being
incorrectly added to $PATH.
Remove an older, FreeBSD-specific workaround.
Modified:
openoffice/trunk/main/set_soenv.in
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1820483&r1=1820482&r2=1820483&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Sun Jan 7 19:51:56 2018
@@ -359,7 +359,7 @@ elsif ( $platform =~ m/kfreebsd/ )
elsif ( $platform =~ m/freebsd/ )
{ $BIG_SVX = "TRUE";
$COM = "@COM_IS@";
- $COMPATH = '@COMPATH@' . '/bin';
+ $COMPATH = '@COMPATH@';
$CVER = "C300";
$GUI = "UNX";
$GUIBASE = "unx";
@@ -1134,8 +1134,10 @@ if ($platform =~ m/linux|netbsd|odf1|fre
} else {
@javaBits = ();
}
+ my $ccdir = "@CC_PATH@";
+ $ccdir =~ s/\/$//;
$PATH = GetCorrectPath ($PATH,
- $COMPATH, $CC,
+ $ccdir, $CC,
$PERL_PATH, 'perl',
@javaBits);
}
