Do not define BOOST_STACKTRACE_DYN_LINK when BOOST_STACKTRACE_STATIC_LINK is defined

Define BOOST_STACKTRACE_LINK when BOOST_STACKTRACE_STATIC_LINK is defined. Refs #169 .
Revert "Disable static linking in GHA because of https://github.com/boostorg/stacktrace/issues/169 "
2026-01-31 08:42:09 +00:00 · 2024-06-23 20:36:49 +03:00 · 2024-06-21 23:01:57 +03:00 · 2024-06-21 22:58:47 +03:00
2 changed files with 9 additions and 5 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -171,7 +171,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14 ]
-        shared: [ ON ] # https://github.com/boostorg/stacktrace/issues/169
+        shared: [ OFF, ON ]

    runs-on: ${{matrix.os}}

@@ -215,7 +215,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14 ]
-        shared: [ ON ] # https://github.com/boostorg/stacktrace/issues/169
+        shared: [ OFF, ON ]

    runs-on: ${{matrix.os}}

@@ -275,7 +275,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14 ]
-        shared: [ ON ] # https://github.com/boostorg/stacktrace/issues/169
+        shared: [ OFF, ON ]

    runs-on: ${{matrix.os}}

@@ -443,7 +443,7 @@ jobs:
      fail-fast: false
      matrix:
        os: [ windows-2019, windows-2022 ]
-        shared: [ ON ] # https://github.com/boostorg/stacktrace/issues/169
+        shared: [ OFF, ON ]

    runs-on: ${{matrix.os}}

--- a/include/boost/stacktrace/detail/push_options.h
+++ b/include/boost/stacktrace/detail/push_options.h
@@ -11,7 +11,11 @@
 #   define BOOST_STACKTRACE_LINK
 #endif

-#if defined(BOOST_STACKTRACE_LINK) && !defined(BOOST_STACKTRACE_DYN_LINK) && defined(BOOST_ALL_DYN_LINK)
+#if !defined(BOOST_STACKTRACE_LINK) && defined(BOOST_STACKTRACE_STATIC_LINK)
+#   define BOOST_STACKTRACE_LINK
+#endif
+
+#if defined(BOOST_STACKTRACE_LINK) && !defined(BOOST_STACKTRACE_DYN_LINK) && !defined(BOOST_STACKTRACE_STATIC_LINK) && defined(BOOST_ALL_DYN_LINK)
 #   define BOOST_STACKTRACE_DYN_LINK
 #endif
Author	SHA1	Message	Date
Peter Dimov	34e56c4e90	Do not define BOOST_STACKTRACE_DYN_LINK when BOOST_STACKTRACE_STATIC_LINK is defined	2024-06-23 20:36:49 +03:00
Peter Dimov	f32bd5a543	Define BOOST_STACKTRACE_LINK when BOOST_STACKTRACE_STATIC_LINK is defined. Refs #169 .	2024-06-21 23:01:57 +03:00
Peter Dimov	79fc075655	Revert "Disable static linking in GHA because of https://github.com/boostorg/stacktrace/issues/169 " This reverts commit `274aeaa351`.	2024-06-21 22:58:47 +03:00