solenv/bin/deliver.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 4373ecda6a3f977f449be3844f7d0e9c63873cf5 Author: Tor Lillqvist <[email protected]> Date: Thu Nov 3 13:50:04 2011 +0200 Don't attempt any stripping when cross-compiling It uses a hardcoded plain "strip" command anyway, which hardly will work for foreign executable file formats. diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 63c0c77..3860fc8 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -704,7 +704,8 @@ sub is_unstripped { } sub initialize_strip { - if ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq "")) { + if (((!defined $ENV{CROSS_COMPILING}) || ($ENV{CROSS_COMPILING} ne 'YES')) && + ((!defined $ENV{DISABLE_STRIP}) || ($ENV{DISABLE_STRIP} eq ""))) { $strip .= 'guw ' if ($^O eq 'cygwin'); $strip .= 'strip'; $strip .= " -x" if ($ENV{OS} eq 'MACOSX'); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
