diff --git a/src/Makefile.am b/src/Makefile.am index f0e9a055..451d98c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ lib_LIBRARIES = lib_LTLIBRARIES = if !REMOTE_ONLY lib_LIBRARIES += libunwind-ptrace.a -lib_LTLIBRARIES += libunwind.la libunwind-setjmp.la +lib_LTLIBRARIES += libunwind.la endif noinst_HEADERS = @@ -477,6 +477,12 @@ endif # ARCH_HPPA endif # ARCH_IA64 endif # ARCH_ARM +# libunwind-setjmp depends on libunwind-$(arch). Therefore must be added +# at the end. +if !REMOTE_ONLY +lib_LTLIBRARIES += libunwind-setjmp.la +endif + # # Don't link with standard libraries, because those may mention # libunwind already.