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

define HOST_SUFFIX as empty string when not cross-compiling as it's also used in this case (fixes breakage in library names introduced by r59381)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-09 22:41:02 +00:00
parent ecc322264b
commit 28c594914e
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 58985 2009-02-18 11:05:38Z FM .
# From configure.in Id: configure.in 59381 2009-03-06 20:06:59Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -2535,8 +2535,13 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias"
if test "$cross_compiling" = "yes"; then
HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias"
else
HOST_PREFIX=
HOST_SUFFIX=
fi
wx_major_version_number=2
@@ -33960,14 +33965,9 @@ fi
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
TOOLCHAIN_FULLNAME="$HOST_PREFIX$TOOLCHAIN_FULLNAME"
fi
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then

18
configure.in
View File

@@ -26,8 +26,13 @@ dnl sets build, host variables and the same with _alias
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias"
if test "$cross_compiling" = "yes"; then
HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias"
else
HOST_PREFIX=
HOST_SUFFIX=
fi
dnl When making releases do:
dnl
@@ -3855,14 +3860,9 @@ fi
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
TOOLCHAIN_FULLNAME="$HOST_PREFIX$TOOLCHAIN_FULLNAME"
fi
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
dnl library link name
dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.