Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix setting of HOST_{PRE,SUF}FIX in case --host option is specified but --build is not (this is not recommended by autoconf but still possible)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-28 19:10:05 +00:00
parent 17ba83947d
commit 6ab6fc6eec
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 59458 2009-03-09 22:41:02Z VZ . # From configure.in Id: configure.in 59561 2009-03-15 16:07:56Z KO .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
# #
@@ -2536,7 +2536,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
if test "$cross_compiling" = "yes"; then if test "$cross_compiling" != "no"; then
HOST_PREFIX="${host_alias}-" HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias" HOST_SUFFIX="-$host_alias"
else else
@@ -47052,7 +47052,7 @@ echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;}
fi fi
if test "$cross_compiling" = "yes"; then if test "$cross_compiling" != "no"; then
OSINFO="\"$host\"" OSINFO="\"$host\""
else else
OSINFO=`uname -s -r -m` OSINFO=`uname -s -r -m`

7
configure.in
View File

@@ -26,7 +26,10 @@ dnl sets build, host variables and the same with _alias
AC_CANONICAL_BUILD AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
if test "$cross_compiling" = "yes"; then dnl notice that if --host was given but --build was not, cross_compiling is
dnl only set to "maybe" and not "yes" and will be either set to "yes" later or
dnl configure will exit with error in AC_PROG_CC so don't test for = "yes" here
if test "$cross_compiling" != "no"; then
HOST_PREFIX="${host_alias}-" HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias" HOST_SUFFIX="-$host_alias"
else else
@@ -7290,7 +7293,7 @@ dnl ---------------------------------------------------------------------------
dnl get the string with OS info - used by wxGetOsDescription() on MacOS X dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
if test "$cross_compiling" = "yes"; then if test "$cross_compiling" != "no"; then
dnl Use best guess from host as we can't use uname when cross compiling dnl Use best guess from host as we can't use uname when cross compiling
OSINFO="\"$host\"" OSINFO="\"$host\""
else else