summaryrefslogtreecommitdiff
path: root/solenv/bin
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-10-24 11:03:24 +0200
committerDavid Tardon <dtardon@redhat.com>2017-10-24 11:04:56 +0200
commit7e389ae76965fdbd4cdf0a8482592295489a48d7 (patch)
treed2a6b93a65c34111c181d0b2d8603248656931be /solenv/bin
parentf49b6d89fd9a903ce01a30bf9971188737ceda14 (diff)
allow to override ENABLE_STRIP in the installer
... because we set ENABLE_STRIP in instsetoo_native/CustomTarget_install.mk . Change-Id: I4eaf66c53a0ec680688bf819b3a396865e7a3e33
Diffstat (limited to 'solenv/bin')
-rw-r--r--solenv/bin/modules/installer/environment.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 8afe3c12c782..38448a8ba9fb 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -122,8 +122,8 @@ sub set_global_environment_variables
if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; }
- if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
if (( $ENV{'ENABLE_STRIP'} ) && ( $ENV{'ENABLE_STRIP'} ne '' )) { $installer::globals::strip = 1; }
+ if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; }
if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; }
# Special handling, if LOCALINSTALLDIR contains "~" in the path