matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Platform::ExecutableName on freebsd

Browse Source 
Also fix release (but somehow only release) builds failing to link because execinfo is a library on freebsd.
This commit is contained in:
Tamás Bálint Misius 2024-01-15 19:53:11 +01:00
parent 708d543d29
commit 5eb5383f08
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/platform/Linux.cpp
View File

@ -6,6 +6,9 @@
#include "Config.h"
#include <cstring>
#include <ctime>
#ifdef __FreeBSD__
# include <sys/sysctl.h>
#endif
namespace Platform
{
@ -26,7 +29,26 @@ long unsigned int GetTime()
ByteString ExecutableNameFirstApprox()
{
return "/proc/self/exe";
if (Stat("/proc/self/exe"))
{
return "/proc/self/exe";
}
#ifdef __FreeBSD__
{
int mib[4];
mib[0] = CTL_KERN;
mib[1] = KERN_PROC;
mib[2] = KERN_PROC_PATHNAME;
mib[3] = -1;
std::array<char, 1000> buf;
size_t cb = buf.size();
if (!sysctl(mib, 4, &buf[0], &cb, NULL, 0))
{
return ByteString(&buf[0], &buf[0] + cb);
}
}
#endif
return "";
}
bool CanUpdate()

5
src/common/platform/stacktrace/meson.build
View File

@ -16,6 +16,11 @@ elif host_platform == 'linux'
stacktrace_files = files('Execinfo.cpp')
# export symbols so backtrace_symbols works, see above
bluescreen_export_symbols = true
if host_machine.system() in [ 'freebsd' ]
project_deps += [
c_compiler.find_library('execinfo'),
]
endif
else
stacktrace_files = files('Null.cpp')
endif