summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-11-03 13:50:04 +0200
committerTor Lillqvist <tlillqvist@suse.com>2011-11-03 13:53:38 +0200
commit4373ecda6a3f977f449be3844f7d0e9c63873cf5 (patch)
treea3b45766c8823e8c92210d3aa15375ed4a5ccfea
parentbe5855de62ea99a9bb67556f1db548aa56cda605 (diff)
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.
-rwxr-xr-xsolenv/bin/deliver.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 63c0c7744631..3860fc8650e7 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');