Skip to content

Commit

Permalink
Include -D_GLIBCXX_USE_CXX11_ABI=0 in pkg-config flags
Browse files Browse the repository at this point in the history
Ensure that any program using libosrm as a dependency builds against
the same libstdc++ ABI. This is needed as Mason dependencies are
still built against the old ABI.
  • Loading branch information
mjjbell committed May 26, 2021
1 parent c51ed23 commit 53382d7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ if(ENABLE_MASON)
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")

# current mason packages target -D_GLIBCXX_USE_CXX11_ABI=0
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
add_dependency_defines(-D_GLIBCXX_USE_CXX11_ABI=0)

# note: we avoid calling find_package(Osmium ...) here to ensure that the
# expat and bzip2 are used from mason rather than the system
Expand Down

0 comments on commit 53382d7

Please sign in to comment.