From 03b2194deabf1470c2b2e6e6b381ba2811c739e6 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Sat, 7 Dec 2019 00:08:10 +0100
Subject: Fix Makefile-based compilation on platforms that use libbacktrace
 with a different executable format than elf

---
 src/char/Makefile.in   | 2 +-
 src/common/Makefile.in | 2 +-
 src/login/Makefile.in  | 2 +-
 src/map/Makefile.in    | 2 +-
 src/test/Makefile.in   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index 34fc0fcba..dc687d589 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -38,7 +38,7 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
 
 LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace
 LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \
-              dwarf.o elf.o fileline.o mmapio.o mmap.o posix.o print.o \
+              dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \
               simple.o sort.o state.o)
 LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \
               backtrace-supported.h config.h filenames.h internal.h)
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 82b651589..97ba34775 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -35,7 +35,7 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
 
 LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace
 LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \
-              dwarf.o elf.o fileline.o mmapio.o mmap.o posix.o print.o \
+              dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \
               simple.o sort.o state.o)
 LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \
               backtrace-supported.h config.h filenames.h internal.h)
diff --git a/src/login/Makefile.in b/src/login/Makefile.in
index 08a5566fa..4f180070c 100644
--- a/src/login/Makefile.in
+++ b/src/login/Makefile.in
@@ -38,7 +38,7 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
 
 LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace
 LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \
-              dwarf.o elf.o fileline.o mmapio.o mmap.o posix.o print.o \
+              dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \
               simple.o sort.o state.o)
 LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \
               backtrace-supported.h config.h filenames.h internal.h)
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index 2082f7b1b..2b050e99c 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -38,7 +38,7 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
 
 LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace
 LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \
-              dwarf.o elf.o fileline.o mmapio.o mmap.o posix.o print.o \
+              dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \
               simple.o sort.o state.o)
 LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \
               backtrace-supported.h config.h filenames.h internal.h)
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index 948852fdf..967d7dcfc 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -38,7 +38,7 @@ LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \
 
 LIBBACKTRACE_D = $(THIRDPARTY_D)/libbacktrace
 LIBBACKTRACE_OBJ = $(addprefix $(LIBBACKTRACE_D)/, atomic.o backtrace.o \
-              dwarf.o elf.o fileline.o mmapio.o mmap.o posix.o print.o \
+              dwarf.o @LIBBACKTRACE_FORMAT_FILE@ fileline.o mmapio.o mmap.o posix.o print.o \
               simple.o sort.o state.o)
 LIBBACKTRACE_H = $(addprefix $(LIBBACKTRACE_D)/, backtrace.h \
               backtrace-supported.h config.h filenames.h internal.h)
-- 
cgit v1.2.3-70-g09d2