configure: Make Dwarf4 the default debug format.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech
Alexandre Julliard
parent
9f1766193e
commit
769db93d42
|
|
@ -12164,16 +12164,16 @@ fi ;;
|
|||
if test "x$ac_debug_format_seen" = x
|
||||
then
|
||||
case $CROSSDEBUG in
|
||||
*dwarf) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-2" >&5
|
||||
printf %s "checking whether the cross-compiler supports -gdwarf-2... " >&6; }
|
||||
if test ${ac_cv_crosscflags__gdwarf_2+y}
|
||||
*dwarf) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gdwarf-4" >&5
|
||||
printf %s "checking whether the cross-compiler supports -gdwarf-4... " >&6; }
|
||||
if test ${ac_cv_crosscflags__gdwarf_4+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
ac_wine_try_cflags_saved_cc=$CC
|
||||
ac_wine_try_cflags_saved_exeext=$ac_exeext
|
||||
CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gdwarf-2"
|
||||
CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gdwarf-4"
|
||||
CC="$CROSSCC"
|
||||
ac_exeext=".exe"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
|
|
@ -12182,9 +12182,9 @@ int __cdecl mainCRTStartup(void) { return 0; }
|
|||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ac_cv_crosscflags__gdwarf_2=yes
|
||||
ac_cv_crosscflags__gdwarf_4=yes
|
||||
else $as_nop
|
||||
ac_cv_crosscflags__gdwarf_2=no
|
||||
ac_cv_crosscflags__gdwarf_4=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
|
@ -12192,45 +12192,11 @@ CFLAGS=$ac_wine_try_cflags_saved
|
|||
CC=$ac_wine_try_cflags_saved_cc
|
||||
ac_exeext=$ac_wine_try_cflags_saved_exeext
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gdwarf_2" >&5
|
||||
printf "%s\n" "$ac_cv_crosscflags__gdwarf_2" >&6; }
|
||||
if test "x$ac_cv_crosscflags__gdwarf_2" = xyes
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gdwarf_4" >&5
|
||||
printf "%s\n" "$ac_cv_crosscflags__gdwarf_4" >&6; }
|
||||
if test "x$ac_cv_crosscflags__gdwarf_4" = xyes
|
||||
then :
|
||||
EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gdwarf-2"
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gstrict-dwarf" >&5
|
||||
printf %s "checking whether the cross-compiler supports -gstrict-dwarf... " >&6; }
|
||||
if test ${ac_cv_crosscflags__gstrict_dwarf+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
ac_wine_try_cflags_saved_cc=$CC
|
||||
ac_wine_try_cflags_saved_exeext=$ac_exeext
|
||||
CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -gstrict-dwarf"
|
||||
CC="$CROSSCC"
|
||||
ac_exeext=".exe"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int __cdecl mainCRTStartup(void) { return 0; }
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ac_cv_crosscflags__gstrict_dwarf=yes
|
||||
else $as_nop
|
||||
ac_cv_crosscflags__gstrict_dwarf=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
CC=$ac_wine_try_cflags_saved_cc
|
||||
ac_exeext=$ac_wine_try_cflags_saved_exeext
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__gstrict_dwarf" >&5
|
||||
printf "%s\n" "$ac_cv_crosscflags__gstrict_dwarf" >&6; }
|
||||
if test "x$ac_cv_crosscflags__gstrict_dwarf" = xyes
|
||||
then :
|
||||
EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gstrict-dwarf"
|
||||
EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -gdwarf-4"
|
||||
fi ;;
|
||||
pdb) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -gcodeview" >&5
|
||||
printf %s "checking whether the cross-compiler supports -gcodeview... " >&6; }
|
||||
|
|
@ -18588,61 +18554,33 @@ printf "%s\n" "$wine_cv_64bit_compare_swap" >&6; }
|
|||
done
|
||||
if test "x$ac_debug_format_seen" = xdefault
|
||||
then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5
|
||||
printf %s "checking whether the compiler supports -gdwarf-2... " >&6; }
|
||||
if test ${ac_cv_cflags__gdwarf_2+y}
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-4" >&5
|
||||
printf %s "checking whether the compiler supports -gdwarf-4... " >&6; }
|
||||
if test ${ac_cv_cflags__gdwarf_4+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
CFLAGS="$CFLAGS -gdwarf-2"
|
||||
CFLAGS="$CFLAGS -gdwarf-4"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int main(int argc, char **argv) { return 0; }
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ac_cv_cflags__gdwarf_2=yes
|
||||
ac_cv_cflags__gdwarf_4=yes
|
||||
else $as_nop
|
||||
ac_cv_cflags__gdwarf_2=no
|
||||
ac_cv_cflags__gdwarf_4=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gdwarf_2" >&5
|
||||
printf "%s\n" "$ac_cv_cflags__gdwarf_2" >&6; }
|
||||
if test "x$ac_cv_cflags__gdwarf_2" = xyes
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gdwarf_4" >&5
|
||||
printf "%s\n" "$ac_cv_cflags__gdwarf_4" >&6; }
|
||||
if test "x$ac_cv_cflags__gdwarf_4" = xyes
|
||||
then :
|
||||
EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2"
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5
|
||||
printf %s "checking whether the compiler supports -gstrict-dwarf... " >&6; }
|
||||
if test ${ac_cv_cflags__gstrict_dwarf+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
CFLAGS="$CFLAGS -gstrict-dwarf"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int main(int argc, char **argv) { return 0; }
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"
|
||||
then :
|
||||
ac_cv_cflags__gstrict_dwarf=yes
|
||||
else $as_nop
|
||||
ac_cv_cflags__gstrict_dwarf=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gstrict_dwarf" >&5
|
||||
printf "%s\n" "$ac_cv_cflags__gstrict_dwarf" >&6; }
|
||||
if test "x$ac_cv_cflags__gstrict_dwarf" = xyes
|
||||
then :
|
||||
EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf"
|
||||
EXTRACFLAGS="$EXTRACFLAGS -gdwarf-4"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1029,8 +1029,7 @@ then
|
|||
if test "x$ac_debug_format_seen" = x
|
||||
then
|
||||
case $CROSSDEBUG in
|
||||
*dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-2])
|
||||
WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
|
||||
*dwarf) WINE_TRY_CROSSCFLAGS([-gdwarf-4]) ;;
|
||||
pdb) WINE_TRY_CROSSCFLAGS([-gcodeview]) ;;
|
||||
esac
|
||||
fi
|
||||
|
|
@ -1843,8 +1842,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
|
|||
done
|
||||
if test "x$ac_debug_format_seen" = xdefault
|
||||
then
|
||||
WINE_TRY_CFLAGS([-gdwarf-2])
|
||||
WINE_TRY_CFLAGS([-gstrict-dwarf])
|
||||
WINE_TRY_CFLAGS([-gdwarf-4])
|
||||
fi
|
||||
|
||||
dnl Disable gcc builtins except for Mingw
|
||||
|
|
|
|||
Loading…
Reference in New Issue