You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/14 16:56:31 UTC

svn commit: r1482365 - /openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl

Author: hdu
Date: Tue May 14 14:56:31 2013
New Revision: 1482365

URL: http://svn.apache.org/r1482365
Log:
default to the strip tool to next to the compiler but don't depend on it

Modified:
    openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl

Modified: openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl?rev=1482365&r1=1482364&r2=1482365&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl (original)
+++ openoffice/branches/rejuvenate01/main/solenv/bin/deliver.pl Tue May 14 14:56:31 2013
@@ -737,7 +737,8 @@ sub is_unstripped {
 sub initialize_strip {
     if ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq "")) {
         $strip .= 'guw ' if ($^O eq 'cygwin');
-        $strip .= $::CC_PATH . 'strip';
+        $strip .= $::CC_PATH if (-e $::CC_PATH.'/strip');
+        $strip .= 'strip';
         $strip .= " -x" if ($ENV{OS} eq 'MACOSX');
         $strip .= " -R '.comment' -s" if ($ENV{OS} eq 'LINUX');
     };