regenerated after bakefile change to always create shared-ld-sh under Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
160
configure
vendored
160
configure
vendored
@@ -44337,75 +44337,6 @@ echo "${ECHO_T}$bakefile_cv_prog_icc" >&6
|
||||
|
||||
*-*-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 $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6
|
||||
if test "${bakefile_cv_gcc31+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#if (__GNUC__ < 3) || \
|
||||
((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
|
||||
#error old gcc
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
|
||||
bakefile_cv_gcc31=yes
|
||||
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
bakefile_cv_gcc31=no
|
||||
|
||||
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_gcc31" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_gcc31" >&6
|
||||
if test "$bakefile_cv_gcc31" = "no"; then
|
||||
|
||||
D='$'
|
||||
cat <<EOF >shared-ld-sh
|
||||
#!/bin/sh
|
||||
@@ -44500,8 +44431,77 @@ rm -f master.${D}${D}.o
|
||||
exit ${D}status
|
||||
EOF
|
||||
|
||||
chmod +x shared-ld-sh
|
||||
chmod +x shared-ld-sh
|
||||
|
||||
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 $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6
|
||||
if test "${bakefile_cv_gcc31+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
#if (__GNUC__ < 3) || \
|
||||
((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
|
||||
#error old gcc
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
|
||||
bakefile_cv_gcc31=yes
|
||||
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
|
||||
bakefile_cv_gcc31=no
|
||||
|
||||
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_gcc31" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_gcc31" >&6
|
||||
if test "$bakefile_cv_gcc31" = "no"; then
|
||||
SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
|
||||
SHARED_LD_CXX="$SHARED_LD_CC"
|
||||
else
|
||||
@@ -44519,18 +44519,18 @@ EOF
|
||||
|
||||
*-*-aix* )
|
||||
if test "x$GCC" = "xyes"; then
|
||||
PIC_FLAG=""
|
||||
PIC_FLAG=""
|
||||
|
||||
case "${BAKEFILE_HOST}" in
|
||||
*-*-aix5* )
|
||||
LD_EXPFULL="-Wl,-bexpfull"
|
||||
;;
|
||||
esac
|
||||
case "${BAKEFILE_HOST}" in
|
||||
*-*-aix5* )
|
||||
LD_EXPFULL="-Wl,-bexpfull"
|
||||
;;
|
||||
esac
|
||||
|
||||
SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o"
|
||||
SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o"
|
||||
else
|
||||
# Extract the first word of "makeC++SharedLib", so it can be a program name with args.
|
||||
SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o"
|
||||
SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o"
|
||||
else
|
||||
# Extract the first word of "makeC++SharedLib", so it can be a program name with args.
|
||||
set dummy makeC++SharedLib; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
|
||||
Reference in New Issue
Block a user