diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2012-06-30 14:52:05 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2012-06-30 14:52:05 (GMT) |
| commit | ba01583eef8741deb837191aa2e58d860e756f41 (patch) | |
| tree | 60a17da264c45521a5d4b7fe37b8ec1a84cf9b13 | |
| parent | 51f6594054c9c35bad92a8c488692766a180cbdd (diff) | |
| download | cpython-ba01583eef8741deb837191aa2e58d860e756f41.zip cpython-ba01583eef8741deb837191aa2e58d860e756f41.tar.gz cpython-ba01583eef8741deb837191aa2e58d860e756f41.tar.bz2 | |
- Issue #14324: use a linker test to check for profiling support
| -rwxr-xr-x | configure | 42 | ||||
| -rw-r--r-- | configure.ac | 35 |
2 files changed, 38 insertions, 39 deletions
@@ -3211,7 +3211,7 @@ then linux*) MACHDEP="linux";; cygwin*) MACHDEP="cygwin";; darwin*) MACHDEP="darwin";; - irix646) MACHDEP="irix6";; + irix646) MACHDEP="irix6";; '') MACHDEP="unknown";; esac fi @@ -5424,37 +5424,35 @@ $as_echo "$enable_shared" >&6; } $as_echo_n "checking for --enable-profiling... " >&6; } # Check whether --enable-profiling was given. if test "${enable_profiling+set}" = set; then : - enableval=$enable_profiling; ac_save_cc="$CC" - CC="$CC -pg" - if test "$cross_compiling" = yes; then : - ac_enable_profiling="no" -else + enableval=$enable_profiling; +fi + +if test "x$enable_profiling" = xyes; then + ac_save_cc="$CC" + CC="$(CC) -pg" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main() { return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_enable_profiling="yes" +if ac_fn_c_try_link "$LINENO"; then : + else - ac_enable_profiling="no" + enable_profiling=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CC="$ac_save_cc" +else + enable_profiling=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_profiling" >&5 +$as_echo "$enable_profiling" >&6; } - CC="$ac_save_cc" +if test "x$enable_profiling" = xyes; then + BASECFLAGS="-pg $BASECFLAGS" + LDFLAGS="-pg $LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_enable_profiling" >&5 -$as_echo "$ac_enable_profiling" >&6; } - -case "$ac_enable_profiling" in - "yes") - BASECFLAGS="-pg $BASECFLAGS" - LDFLAGS="-pg $LDFLAGS" - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LDLIBRARY" >&5 $as_echo_n "checking LDLIBRARY... " >&6; } diff --git a/configure.ac b/configure.ac index 16b20f9..60f8541 100644 --- a/configure.ac +++ b/configure.ac @@ -348,7 +348,7 @@ then linux*) MACHDEP="linux";; cygwin*) MACHDEP="cygwin";; darwin*) MACHDEP="darwin";; - irix646) MACHDEP="irix6";; + irix646) MACHDEP="irix6";; '') MACHDEP="unknown";; esac fi @@ -813,22 +813,23 @@ AC_MSG_RESULT($enable_shared) AC_MSG_CHECKING(for --enable-profiling) AC_ARG_ENABLE(profiling, - AS_HELP_STRING([--enable-profiling], [enable C-level code profiling]), -[ac_save_cc="$CC" - CC="$CC -pg" - AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])], - [ac_enable_profiling="yes"], - [ac_enable_profiling="no"], - [ac_enable_profiling="no"]) - CC="$ac_save_cc"]) -AC_MSG_RESULT($ac_enable_profiling) - -case "$ac_enable_profiling" in - "yes") - BASECFLAGS="-pg $BASECFLAGS" - LDFLAGS="-pg $LDFLAGS" - ;; -esac + AS_HELP_STRING([--enable-profiling], [enable C-level code profiling])) +if test "x$enable_profiling" = xyes; then + ac_save_cc="$CC" + CC="$(CC) -pg" + AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])], + [], + [enable_profiling=no]) + CC="$ac_save_cc" +else + enable_profiling=no +fi +AC_MSG_RESULT($enable_profiling) + +if test "x$enable_profiling" = xyes; then + BASECFLAGS="-pg $BASECFLAGS" + LDFLAGS="-pg $LDFLAGS" +fi AC_MSG_CHECKING(LDLIBRARY) |