diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-07-23 16:35:01 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-07-23 16:35:31 +0200 |
| commit | 17ddd27bf543eadebe3d950b5184ffce48bd5014 (patch) | |
| tree | 645c5e26e53abd712700f930c7fe99867d0f104b | |
| parent | 6a90d4ec8afd1e58c9b69f4de1364d5b5624300b (diff) | |
Use config_host.mk.source when configuring 'build' for cross-compilation.
Change-Id: I2e6e2a98bbaf515ececa75948d6b20bf9a093fe5
| -rw-r--r-- | config_host.mk.source | 3 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config_host.mk.source b/config_host.mk.source index 10dd6177b035..89f5f4b8109e 100644 --- a/config_host.mk.source +++ b/config_host.mk.source @@ -5,6 +5,7 @@ # source ./config_host.mk.source temp_conf=`mktemp config_host.mk.XXXXXX` -sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' config_host.mk >$temp_conf +sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' \ + -e 's/^\s*export\s\+\([A-Z0-9_]*\)?=\(.*\)$/export \1="${\1:-\2}"/' config_host.mk >$temp_conf source ./$temp_conf rm $temp_conf diff --git a/configure.in b/configure.in index 1006d375ea65..264c6c600320 100644 --- a/configure.in +++ b/configure.in @@ -3527,6 +3527,7 @@ if test "$cross_compiling" = "yes"; then bin/repo-list.in \ config.guess \ config_host.mk.in \ + config_host.mk.source \ configure \ ooo.lst.in \ oowintool \ @@ -3571,8 +3572,7 @@ if test "$cross_compiling" = "yes"; then test -f ./config_host.mk 2>/dev/null || exit cp config_host.mk ../config_build.mk cp config.log ../config.Build.log - sed -e 's,=\(.*\),="\1",' < config_host.mk > config_host.sh - . ./config_host.sh + . ./config_host.mk.source 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 VV='$'$V |