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

use install_name_tool when cross-compiling too: it's not very useful if the build machine can't execute host binaries but it might be possible to do this (e.g. using an emulator) and it doesn't hurt anyhow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-06 20:06:59 +00:00
parent 7d83595849
commit ddd121d7b6
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@@ -2535,6 +2535,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias"
wx_major_version_number=2 wx_major_version_number=2
@@ -33883,13 +33885,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
;; ;;
*-*-darwin* ) *-*-darwin* )
install_name_tool=`which install_name_tool` install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then if test "$install_name_tool" -a -x "$install_name_tool"; then
SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@" SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
cat <<EOF >change-install-names cat <<EOF >change-install-names
#!/bin/sh #!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
inst_cmd="install_name_tool " inst_cmd="${HOST_PREFIX}install_name_tool "
for i in \${libnames} ; do for i in \${libnames} ; do
inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}" inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
done done
@@ -33963,9 +33965,8 @@ TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffi
TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" 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 if test "$cross_compiling" = "yes"; then
HOST_SUFFIX="-$host_alias"
TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX" TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME" TOOLCHAIN_FULLNAME="$HOST_PREFIX$TOOLCHAIN_FULLNAME"
fi fi

9
configure.in
View File

@@ -26,6 +26,8 @@ dnl sets build, host variables and the same with _alias
AC_CANONICAL_BUILD AC_CANONICAL_BUILD
AC_CANONICAL_HOST AC_CANONICAL_HOST
HOST_PREFIX="${host_alias}-"
HOST_SUFFIX="-$host_alias"
dnl When making releases do: dnl When making releases do:
dnl dnl
@@ -3772,13 +3774,13 @@ if test "$wxUSE_SHARED" = "yes"; then
;; ;;
*-*-darwin* ) *-*-darwin* )
install_name_tool=`which install_name_tool` install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then if test "$install_name_tool" -a -x "$install_name_tool"; then
SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@" SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
cat <<EOF >change-install-names cat <<EOF >change-install-names
#!/bin/sh #!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
inst_cmd="install_name_tool " inst_cmd="${HOST_PREFIX}install_name_tool "
for i in \${libnames} ; do for i in \${libnames} ; do
inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}" inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
done done
@@ -3858,9 +3860,8 @@ TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffi
TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" 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 if test "$cross_compiling" = "yes"; then
HOST_SUFFIX="-$host_alias"
TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX" TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME" TOOLCHAIN_FULLNAME="$HOST_PREFIX$TOOLCHAIN_FULLNAME"
fi fi
dnl library link name dnl library link name