[Libreoffice-commits] core.git: solenv/bin

[David Tardon]

 solenv/bin/modules/installer/environment.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e389ae76965fdbd4cdf0a8482592295489a48d7
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 24 11:03:24 2017 +0200

    allow to override ENABLE_STRIP in the installer
    
    ... because we set ENABLE_STRIP in
    instsetoo_native/CustomTarget_install.mk .
    
    Change-Id: I4eaf66c53a0ec680688bf819b3a396865e7a3e33

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