stop sourcing config_host wholesale, use get_config_variables instead
Change-Id: I1390da403a2f0aab0f4e8323daa9f2fad4ba2550
This commit is contained in:
@@ -1,12 +0,0 @@
|
|||||||
# this script allows to correctly source config_host.mk into existing shell
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
#
|
|
||||||
# source ./config_host.mk.source
|
|
||||||
|
|
||||||
temp_conf=`mktemp config_host.mk.XXXXXX`
|
|
||||||
sed -n -e 's/$(gb_SPACE)/ /g' \
|
|
||||||
-e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/p' \
|
|
||||||
-e 's/^\s*export\s\+\([A-Z0-9_]*\)?=\(.*\)$/export \1="${\1:-\2}"/p' config_host.mk >$temp_conf
|
|
||||||
source ./$temp_conf
|
|
||||||
rm $temp_conf
|
|
@@ -4077,7 +4077,6 @@ if test "$cross_compiling" = "yes"; then
|
|||||||
tar cf - \
|
tar cf - \
|
||||||
config.guess \
|
config.guess \
|
||||||
config_host.mk.in \
|
config_host.mk.in \
|
||||||
config_host.mk.source \
|
|
||||||
configure \
|
configure \
|
||||||
ooo.lst.in \
|
ooo.lst.in \
|
||||||
oowintool \
|
oowintool \
|
||||||
@@ -4134,7 +4133,8 @@ if test "$cross_compiling" = "yes"; then
|
|||||||
test -f ./config_host.mk 2>/dev/null || exit
|
test -f ./config_host.mk 2>/dev/null || exit
|
||||||
cp config_host.mk ../config_build.mk
|
cp config_host.mk ../config_build.mk
|
||||||
cp config.log ../config.Build.log
|
cp config.log ../config.Build.log
|
||||||
. ./config_host.mk.source
|
. ./bin/get_config_variables COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
|
||||||
|
|
||||||
for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
|
for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX DISABLE_PYTHON GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
|
||||||
PYTHON SYSTEM_LIBXSLT; do
|
PYTHON SYSTEM_LIBXSLT; do
|
||||||
VV='$'$V
|
VV='$'$V
|
||||||
|
Reference in New Issue
Block a user