diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c70c44e..5a5b263 100644 --- 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}} diff --git a/include/boost/stacktrace/detail/push_options.h b/include/boost/stacktrace/detail/push_options.h index ae05748..1075140 100644 --- 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