Unset SYSBASE explicitly if not supposed to be set

This fixes cross-compiling from Linux to Android. My guess is that the
build system nowadays, when building the cross_toolset (for the build
platform), sources Env.Build.sh in an environment where Env.Host.sh
has already been sourced. So, if Env.Host.sh exports SYSBASE, that
stayed in force also after sourcing Env.Build.sh, with predictably
horrible results.

For some reason it didn't hurt cross-compiling from Mac OS X, which is
why I hadn't noticed.

1 files changed, 9 insertions, 2 deletions

diff --git a/set_soenv.in b/set_soenv.in
index 3ea4a796b9a7..d1728e7a6de6 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -79,7 +79,8 @@ my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
      $PROEXT, $TARFILE_LOCATION, $GNUMAKE,
      $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS,
-     $MACOSX_SDK_PATH);
+     $MACOSX_SDK_PATH,
+     $SYSBASE);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -1628,7 +1629,13 @@ ToFile( "SOLARINC",          $SOLARINC,          "e" );
 ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
 ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 ToFile( "CC",                $CC,                "e" );
-ToFile( "SYSBASE",           "$ENV{SYSBASE}",    "e" ) if defined $ENV{SYSBASE};
+if ( defined $ENV{SYSBASE} )
+{  $SYSBASE = $ENV{SYSBASE};
+}
+else
+{  $SYSBASE = '';
+}
+ToFile( "SYSBASE",           "$SYSBASE",         "e" );
 ToFile( "CROSS_COMPILING",   "@CROSS_COMPILING@","e" );
 ToFile( "AR",                "@AR@",             "e" );
 ToFile( "DLLTOOL",           "@DLLTOOL@",        "e" );