thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to disable linker options from sentry

Browse Source
This commit is contained in:
Ivan Blinkov 2020-06-09 20:44:56 +03:00
parent 6f7064928f
commit f872c639ed
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -162,4 +162,4 @@
url = https://github.com/fmtlib/fmt.git
[submodule "contrib/sentry-native"]
path = contrib/sentry-native
url = https://github.com/getsentry/sentry-native.git
url = https://github.com/blinkov/sentry-native.git

1
cmake/find/sentry.cmake
View File

@ -11,6 +11,7 @@ if (NOT OS_FREEBSD AND NOT SPLIT_SHARED_LIBRARIES AND NOT (OS_DARWIN AND COMPILE
set (CURL_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/curl/include)
set (SENTRY_TRANSPORT "curl" CACHE STRING "")
set (SENTRY_BACKEND "none" CACHE STRING "")
set (SENTRY_EXPORT_SYMBOLS OFF CACHE BOOL "")
set (SENTRY_LINK_PTHREAD OFF CACHE BOOL "")
if (OS_LINUX AND NOT_UNBUNDLED)
set (BUILD_SHARED_LIBS OFF)

2
contrib/sentry-native vendored

@ -1 +1 @@
Subproject commit 9651561d45e4d00e9fe708275c086a3cfeb496bd
Subproject commit 78fb54989cd61cf11dcea142e12d1ecc6940c962

1
programs/odbc-bridge/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set (CLICKHOUSE_ODBC_BRIDGE_SOURCES
PingHandler.cpp
validateODBCConnectionString.cpp
)
set (USE_SENTRY OFF CACHE BOOL "" FORCE)
set (CLICKHOUSE_ODBC_BRIDGE_LINK
PRIVATE
clickhouse_parsers