migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv

1 files changed, 10 insertions, 0 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 5a7d880bdd5a..850539c9a58f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -267,6 +267,8 @@ export OPENSSL_LIBS="@OPENSSL_LIBS@"
 export OS="@OS@"
 export OSVERSION="@OSVERSION@"
 export OS_FOR_BUILD="@OS_FOR_BUILD@"
+export OUTDIR="@OUTDIR@"
+export OUTDIR_FOR_BUILD="@OUTDIR_FOR_BUILD@"
 export OUTPATH="@OUTPATH@"
 export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"
 export OXYGENOFFICE_PACK="@OXYGENOFFICE_PACK@"
@@ -287,6 +289,7 @@ export PROGRESSBARCOLOR="@PROGRESSBARCOLOR@"
 export PROGRESSFRAMECOLOR="@PROGRESSFRAMECOLOR@"
 export PROGRESSPOSITION="@PROGRESSPOSITION@"
 export PROGRESSSIZE="@PROGRESSSIZE@"
+export PROEXT="@PROEXT@"
 export PSPRINT="TRUE"
 export PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
 export PTHREAD_LIBS="@PTHREAD_LIBS@"
@@ -310,6 +313,11 @@ export SIZEOF_LONG="@SIZEOF_LONG@"
 export SIZEOF_LONGLONG="@SIZEOF_LONGLONG@"
 export SIZEOF_POINTER="@SIZEOF_POINTER@"
 export SIZEOF_SHORT="@SIZEOF_SHORT@"
+export SOLAREXTRALIB="@SOLAREXTRALIB@"
+export SOLARINC="@SOLARINC@"
+export SOLARINC_FOR_BUILD="@SOLARINC_FOR_BUILD@"
+export SOLARLIB="@SOLARLIB@"
+export SOLARLIB_FOR_BUILD="@SOLARLIB_FOR_BUILD@"
 export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@"
 export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@"
 export SRCDIR="@SRC_ROOT@"
@@ -428,6 +436,8 @@ export WITH_OPENLDAP="@WITH_OPENLDAP@"
 export WITH_STLPORT="@WITH_STLPORT@"
 export WITH_THEMES="@WITH_THEMES@"
 export WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
+export WORKDIR="@WORKDIR@"
+export WORKDIR_FOR_BUILD="@WORKDIR_FOR_BUILD@"
 export WORK_STAMP="@SOURCEVERSION@"
 export WPD_CFLAGS="@WPD_CFLAGS@"
 export WPD_LIBS="@WPD_LIBS@"