diff options
| author | David Tardon <dtardon@redhat.com> | 2012-06-16 13:56:33 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-06-17 17:36:52 +0200 |
| commit | 794e2e601fcbed83e6f886db14f3754b68ae0311 (patch) | |
| tree | e7ccb00c36ba2c3ddbdef0b4ce322f73b10ba610 /configure.in | |
| parent | 62cab9f5d3852b5baf7fcffb513e7c3e45b191bb (diff) | |
(incomplete) attempt to build internal python with MinGW
Change-Id: I39c880e8615b164a66eb900c11b26da9d6489e02
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 8edae7cadf4e..011aa2202112 100644 --- a/configure.in +++ b/configure.in @@ -3543,8 +3543,8 @@ if test "$cross_compiling" = "yes"; then cp config.log ../config.Build.log sed -e 's,=\(.*\),="\1",' < config_host.mk > config_host.sh . ./config_host.sh - for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ - SYSTEM_LIBXSLT; do + 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 VV=`eval "echo $VV"` if test -n "$VV"; then @@ -3581,6 +3581,7 @@ else CPUNAME_FOR_BUILD="$CPUNAME" CPU_FOR_BUILD="$CPU" CXX_FOR_BUILD="$CXX" + DISABLE_PYTHON_FOR_BUILD="$DISABLE_PYTHON" GUIBASE_FOR_BUILD="$GUIBASE" GUI_FOR_BUILD="$GUI" INPATH_FOR_BUILD="$INPATH" @@ -3588,6 +3589,7 @@ else OS_FOR_BUILD="$OS" OUTDIR_FOR_BUILD="$OUTDIR" OUTPATH_FOR_BUILD="$OUTPATH" + PYTHON_FOR_BUILD="$PYTHON" WORKDIR_FOR_BUILD="$WORKDIR" fi AC_SUBST(COM_FOR_BUILD) @@ -3601,6 +3603,7 @@ AC_SUBST(CXX_FOR_BUILD) AC_SUBST(INPATH_FOR_BUILD) AC_SUBST(OUTPATH_FOR_BUILD) AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD) +AC_SUBST([PYTHON_FOR_BUILD]) AC_SUBST(OUTDIR_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) @@ -6728,6 +6731,14 @@ no) ;; esac +dnl Cross-build of python requires python that is runnable on the build +dnl platform, because it is used in the build process +if test "$cross_compiling" = yes; then + if test "$DISABLE_PYTHON" = no -a "$SYSTEM_PYTHON" = no -a "$DISABLE_PYTHON_FOR_BUILD" = yes; then + AC_MSG_ERROR([Cross-build of python requires python that is runnable on the build platform. You must not use --disable-python for the 'build' config.]) + fi +fi + AC_SUBST(SYSTEM_PYTHON) AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_LIBS) |