diff options
| author | Pedro Navarro <pnavarro@netflix.com> | 2020-06-08 13:13:52 -0700 |
|---|---|---|
| committer | Dave Watson <dade.watson@gmail.com> | 2020-06-18 13:35:59 -0700 |
| commit | 4b2015fbd8a6a4ec4dd4bcbc2413738cec89b7aa (patch) | |
| tree | 9f8e49bf98a4c9f0274b70398b05f7a2859627e9 | |
| parent | 9165d2a150d707d3037c2045f2cdc0fabd5fee98 (diff) | |
| download | libunwind-4b2015fbd8a6a4ec4dd4bcbc2413738cec89b7aa.tar.gz | |
Added --disable-unwind-header option
When set, unwind.h won't be copied to the installation directory. Some
platforms provide their own unwind.h that might conflict with the one
supplied with libunwind
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 8132fa4c..072decf1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,10 @@ include_HEADERS += include/libunwind-s390x.h endif if !REMOTE_ONLY -include_HEADERS += include/libunwind.h include/unwind.h +include_HEADERS += include/libunwind.h +if BUILD_UNWIND_HEADER +include_HEADERS += include/unwind.h +endif endif nodist_include_HEADERS = include/libunwind-common.h diff --git a/configure.ac b/configure.ac index 73d654c5..b85c37bd 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,13 @@ AC_ARG_ENABLE(weak-backtrace, AS_HELP_STRING([--disable-weak-backtrace],[Do not provide the weak 'backtrace' symbol.]),, [enable_weak_backtrace=yes]) +AC_ARG_ENABLE(unwind-header, + AS_HELP_STRING([--disable-unwind-header],[Do not export the 'unwind.h' header]),, + [enable_unwind_header=yes]) + +AC_MSG_CHECKING([if we should export unwind.h]) +AC_MSG_RESULT([$enable_unwind_header]) + AC_MSG_CHECKING([if we should build libunwind-setjmp]) AC_MSG_RESULT([$enable_setjmp]) @@ -164,6 +171,7 @@ AC_MSG_RESULT([$target_os]) AM_CONDITIONAL(BUILD_COREDUMP, test x$enable_coredump = xyes) AM_CONDITIONAL(BUILD_PTRACE, test x$enable_ptrace = xyes) AM_CONDITIONAL(BUILD_SETJMP, test x$enable_setjmp = xyes) +AM_CONDITIONAL(BUILD_UNWIND_HEADER, test "x$enable_unwind_header" = xyes) AM_CONDITIONAL(NO_PTRACE_TEST, test x$build_arch != x$host_arch) AM_CONDITIONAL(REMOTE_ONLY, test x$target_arch != x$host_arch) AM_CONDITIONAL(ARCH_AARCH64, test x$target_arch = xaarch64) |