set_soenv.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit d364c5bb7211ec60fadf8e065b2a1ffa830493fa
Author: Don Lewis <truck...@apache.org>
Date: Sun Jan 7 19:51:56 2018 +0000
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.
diff --git a/set_soenv.in b/set_soenv.in
index b8e19203b58b..a68924f65467 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -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|freebsd|aix|solaris/)
} else {
@javaBits = ();
}
+ my $ccdir = "@CC_PATH@";
+ $ccdir =~ s/\/$//;
$PATH = GetCorrectPath ($PATH,
- $COMPATH, $CC,
+ $ccdir, $CC,
$PERL_PATH, 'perl',
@javaBits);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
