Merge pull request #9683
Some checks are pending
ci/gh-actions/cli / macOS (brew) (push) Waiting to run
ci/gh-actions/cli / Windows (MSYS2) (push) Waiting to run
ci/gh-actions/cli / Debian 10 (push) Waiting to run
ci/gh-actions/cli / ${{ matrix.name }} (Ubuntu 20.04, ubuntu-20.04) (push) Waiting to run
ci/gh-actions/cli / ${{ matrix.name }} (Ubuntu 22.04, ubuntu-22.04) (push) Waiting to run
ci/gh-actions/cli / Ubuntu 20.04 (libwallet) (push) Waiting to run
ci/gh-actions/cli / Ubuntu 20.04 (tests) (push) Blocked by required conditions
ci/gh-actions/cli / source archive (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:aarch64-apple-darwin name:Cross-Mac aarch64]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:aarch64-linux-android name:ARMv8 Android]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:aarch64-linux-gnu name:ARM v8 packages:g++-aarch64-linux-gnu]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:arm-linux-android name:ARMv7 Android]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:arm-linux-gnueabihf name:ARM v7 packages:g++-arm-linux-gnueabihf]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:i686-pc-linux-gnu name:i686 Linux packages:g++-multilib]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:riscv64-linux-gnu name:RISCV 64bit packages:g++-riscv64-linux-gnu]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:x86_64-apple-darwin name:Cross-Mac x86_64]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:x86_64-unknown-freebsd name:x86_64 Freebsd packages:clang-8]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:x86_64-unknown-linux-gnu name:x86_64 Linux]) (push) Waiting to run
ci/gh-actions/depends / ${{ matrix.toolchain.name }} (map[host:x86_64-w64-mingw32 name:Win64 packages:g++-mingw-w64-x86-64]) (push) Waiting to run

133298d Fix linking error with libunwind when build for FreeBSD with GCC, by preferring easylogging++ when GCC is being used (WHR)
This commit is contained in:
tobtoht 2025-01-18 11:11:47 +00:00
commit 94f7efd53f
No known key found for this signature in database
GPG Key ID: E45B10DD027D2472

View File

@ -26,7 +26,7 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ || defined __FreeBSD__
#if !defined __GNUC__ || defined __clang__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__
#define USE_UNWIND
#else
#define ELPP_FEATURE_CRASH_LOG 1