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

don't use -single_module together with -bundle under Darwin (ld gives an error for this)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-10-09 12:49:09 +00:00
parent d1dbe757c0
commit 2eef85139b
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/aclocal/bakefile.m4
View File

@@ -315,8 +315,11 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
dnl or with a double stage link in order to create a single module dnl or with a double stage link in order to create a single module
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
dnl If using newer dev tools then there is a -single_module flag that dnl If using newer dev tools then there is a -single_module flag that
dnl we can use to do this, otherwise we'll need to use a helper dnl we can use to do this for dylibs, otherwise we'll need to use a helper
dnl script. Check the version of gcc to see which way we can go: dnl script. Check the version of gcc to see which way we can go:
AC_CACHE_CHECK([for gcc 3.1 or later], bakefile_cv_gcc31, [ AC_CACHE_CHECK([for gcc 3.1 or later], bakefile_cv_gcc31, [
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
@@ -340,15 +343,11 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
dnl Use the shared-ld-sh helper script dnl Use the shared-ld-sh helper script
SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o" SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_CXX="$SHARED_LD_CC" SHARED_LD_CXX="$SHARED_LD_CC"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
else else
dnl Use the -single_module flag and let the linker do it for us dnl Use the -single_module flag and let the linker do it for us
SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o" SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
fi fi
if test "x$GCC" == "xyes"; then if test "x$GCC" == "xyes"; then

21
configure vendored
View File

@@ -1737,6 +1737,8 @@ case "${host}" in
#define __HPUX__ 1 #define __HPUX__ 1
_ACEOF _ACEOF
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
;; ;;
*-*-linux* ) *-*-linux* )
USE_LINUX=1 USE_LINUX=1
@@ -22364,6 +22366,17 @@ if test "x$SGICXX" = "xyes"; then
CXXFLAGS="$CXXFLAGS -woff 3970" CXXFLAGS="$CXXFLAGS -woff 3970"
fi fi
if test "x$HPCC" = "xyes"; then
CFLAGS="$CFLAGS +W 2011,2450"
fi
if test "x$HPCXX" = "xyes"; then
CXXFLAGS="$CXXFLAGS +W 2340"
fi
if test "x$COMPAQCXX" = "xyes"; then
CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
fi
if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
ac_ext=cc ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
@@ -44270,6 +44283,9 @@ echo "${ECHO_T}$bakefile_cv_prog_icc" >&6
*-*-darwin* ) *-*-darwin* )
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5 echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6 echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6
if test "${bakefile_cv_gcc31+set}" = set; then if test "${bakefile_cv_gcc31+set}" = set; then
@@ -44433,14 +44449,10 @@ EOF
chmod +x shared-ld-sh chmod +x shared-ld-sh
SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o" SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
SHARED_LD_CXX="$SHARED_LD_CC" SHARED_LD_CXX="$SHARED_LD_CC"
SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
else else
SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o" SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o" SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
fi fi
if test "x$GCC" == "xyes"; then if test "x$GCC" == "xyes"; then
@@ -46239,6 +46251,7 @@ if test $GCC_PCH = 1 ; then
CPPFLAGS="-DWX_PRECOMP $CPPFLAGS" CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
fi fi
CPPFLAGS="$CPPFLAGS $TOOLCHAIN_DEFS"
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"