libbacktrace: don't fail tests if dwz fails

* Makefile.am (%_dwz): If dwz fails, use uncompressed debug info.
	* Makefile.in: Regenerate.
	* configure: Regenerate.
This commit is contained in:
Ian Lance Taylor 2021-01-18 14:45:57 -08:00
parent 325e70b47c
commit bfde774667
3 changed files with 17 additions and 9 deletions

View File

@ -303,9 +303,13 @@ if HAVE_DWZ
rm -f $@ $@_common.debug
cp $< $@_1
cp $< $@_2
$(DWZ) -m $@_common.debug $@_1 $@_2
rm -f $@_2
mv $@_1 $@
if $(DWZ) -m $@_common.debug $@_1 $@_2; then \
rm -f $@_2; \
mv $@_1 $@; \
else \
echo "Ignoring dwz errors, assuming that test passes"; \
cp $< $@; \
fi
TESTS += btest_dwz

View File

@ -15,7 +15,7 @@
@SET_MAKE@
# Makefile.am -- Backtrace Makefile.
# Copyright (C) 2012-2020 Free Software Foundation, Inc.
# Copyright (C) 2012-2021 Free Software Foundation, Inc.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@ -2433,9 +2433,13 @@ uninstall-am:
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ rm -f $@ $@_common.debug
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ cp $< $@_1
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ cp $< $@_2
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ $(DWZ) -m $@_common.debug $@_1 $@_2
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ rm -f $@_2
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ mv $@_1 $@
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ if $(DWZ) -m $@_common.debug $@_1 $@_2; then \
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ rm -f $@_2; \
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ mv $@_1 $@; \
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ else \
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ echo "Ignoring dwz errors, assuming that test passes"; \
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ cp $< $@; \
@HAVE_DWZ_TRUE@@NATIVE_TRUE@ fi
@NATIVE_TRUE@edtest2_build.c: gen_edtest2_build; @true
@NATIVE_TRUE@gen_edtest2_build: $(srcdir)/edtest2.c

View File

@ -11509,7 +11509,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11522 "configure"
#line 11512 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11615,7 +11615,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11628 "configure"
#line 11618 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H