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. git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1820483 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 7, 2018 · deb9523 · deb9523
1 parent b92aace
commit deb9523
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/main/set_soenv.in b/main/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);
 }