Move MACOS related variable out of set_soenv.in

3 files changed, 10 insertions, 32 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index bd26074f94e5..fb65ff14ea27 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -118,6 +118,7 @@ export EPM_FLAGS="@EPM_FLAGS@"
 export FLUTE_JAR="@FLUTE_JAR@"
 export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
 export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
+export FRAMEWORKSHOME="@FRAMEWORKSHOME@"
 export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
 export FREETYPE_LIBS="@FREETYPE_LIBS@"
 export GCONF_CFLAGS="@GCONF_CFLAGS@"
@@ -214,6 +215,11 @@ export LIBXSLT_LIBS="@LIBXSLT_LIBS@"
 export LUCENE_ANALYZERS_JAR="@LUCENE_ANALYZERS_JAR@"
 export LUCENE_CORE_JAR="@LUCENE_CORE_JAR@"
 export MANDIR="@MANDIR@"
+export MACOSX_DEPLOYMENT_TARGET="@MACOSX_DEPLOYMENT_TARGET@"
+export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@"
+export MACOSX_SDK_PATH="@MACOSX_SDK_PATH@"
+export MAC_OS_X_VERSION_MAX_ALLOWED="@MAC_OS_X_VERSION_MAX_ALLOWED@"
+export MAC_OS_X_VERSION_MIN_REQUIRED="@MAC_OS_X_VERSION_MIN_REQUIRED@"
 export MDDS_CPPFLAGS="@MDDS_CPPFLAGS@"
 export MERGELIBS="@MERGELIBS@"
 export MFC_INCLUDE="@MFC_INCLUDE@"
diff --git a/configure.in b/configure.in
index de25e851b175..be0848d3293c 100644
--- a/configure.in
+++ b/configure.in
@@ -2152,6 +2152,7 @@ if test "$_os" = "Darwin" ; then
     else
         AC_MSG_ERROR([$MACOSX_SDK_PATH not found])
     fi
+    FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks";
     MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
 
     case "$with_macosx_version_min_required" in
@@ -2226,6 +2227,7 @@ if test "$_os" = "Darwin" ; then
     AC_MSG_NOTICE([MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED])
     AC_MSG_NOTICE([MAC_OS_X_VERSION_MAX_ALLOWED=$MAC_OS_X_VERSION_MAX_ALLOWED])
 fi
+AC_SUBST(FRAMEWORKSHOME)
 AC_SUBST(MACOSX_SDK_PATH)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED)
@@ -3064,6 +3066,7 @@ else
     INPATH_FOR_BUILD="$INPATH"
     OS_FOR_BUILD="$OS"
     OUTPATH_FOR_BUILD="$OUTPATH"
+    MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="$MACOSX_DEPLOYMENT_TARGET"
 fi
 AC_SUBST(COM_FOR_BUILD)
 AC_SUBST(GUI_FOR_BUILD)
diff --git a/set_soenv.in b/set_soenv.in
index e67b95658f5c..64990e6d8861 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -78,7 +78,6 @@ my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $WIN_GNUCOPY, $WIN_TOUCH,
      $PROEXT, $TARFILE_LOCATION, $GNUMAKE,
      $PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA,
-     $MACOSX_SDK_PATH,
      $SYSBASE);
 #
 #-------------------------------------------
@@ -91,6 +90,7 @@ my ( $dmake, $build, $mkout, $deliver, $zipdep );
 $INPATH="@INPATH@";
 $OUTPATH="@OUTPATH@";
 $COMPATH="@COMPATH@";
+$FRAMEWORKSHOME="@FRAMEWORKSHOME@";
 #-------------------------------------------------------------
 # IIIa. Initialising constants.
 #-------------------------------------------------------------
@@ -178,22 +178,6 @@ if ( $platform =~ m/cygwin|mingw32/ )
 }
 elsif ( $platform =~ m/darwin/ )
 {
-    if ($platform =~ m/^arm/)
-    {
-        print "Setting values for iOS... ";
-    }
-    elsif ($platform =~ m/^powerpc/)
-    {
-        print "Setting values for Mac OS X/Darwin on PowerPC... ";
-        $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
-        $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
-    }
-    else
-    {
-        print "Setting values for Mac OS X/Darwin on default x86... ";
-        $MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
-        $FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
-    }
 }
 
 print "done\n";
@@ -723,7 +707,6 @@ ToFile( "ANT_LIB",           PathFormat("@ANT_LIB@"), "e" );
 ToFile( "ANT",               PathFormat("@ANT@"), "e" );
 ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
 ToFile( "ASM_PATH",          $ASM_PATH,          "e" );
-ToFile( "FRAMEWORKSHOME",    $FRAMEWORKSHOME,    "e" );
 ToFile( "Empty",             $empty,             "n" );
 
 #
@@ -751,19 +734,6 @@ ToFile( "SOLAR_JAVA",        $SOLAR_JAVA,        "e" );
 ToFile( "DYNAMIC_CRT",       $DYNAMIC_CRT,       "e" );
 ToFile( "use_shl_versions",  $use_shl_versions,  "e" );
 
-if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
-{
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build,
-# build can assume functions/libraries of that version to be available
-# unless you want to do runtime checks for 10.5 api, you also want to use the 10.4 sdk
-# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
-# http://developer.apple.com/technotes/tn2002/tn2064.html
-    ToFile( "MACOSX_DEPLOYMENT_TARGET",       "@MACOSX_DEPLOYMENT_TARGET@",       "e" );
-    ToFile( "MACOSX_SDK_PATH",                "@MACOSX_SDK_PATH@",                "e" );
-    ToFile( "MAC_OS_X_VERSION_MIN_REQUIRED",  "@MAC_OS_X_VERSION_MIN_REQUIRED@", "e" );
-    ToFile( "MAC_OS_X_VERSION_MAX_ALLOWED",   "@MAC_OS_X_VERSION_MAX_ALLOWED@",  "e" );
-}
-
 #
 # Writing the variables to file.
 # (c = comment, e = environment variable, a = alias, n = newline )
@@ -873,7 +843,6 @@ if ( '@CROSS_COMPILING@' eq 'YES' )
    ToFile( "CC_FOR_BUILD",      "@CC_FOR_BUILD@",   "e" );
    ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
    ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
-   ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
    ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" );
    ToFile( "OUTDIR_FOR_BUILD",  "@OUTDIR_FOR_BUILD@", "e");
    ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e");