Skip to content

Commit

Permalink
project config change
Browse files Browse the repository at this point in the history
  • Loading branch information
liuneng1994 authored and kyligence-git committed May 17, 2023
1 parent 8f165f9 commit 79af00b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,6 @@ tests/queries/0_stateless/*.expect.history
/rust/**/target
# It is autogenerated from *.in
/rust/**/.cargo/config.toml

utils/local-engine/tests/testConfig.h
/utils/extern-local-engine
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ endif ()

include(cmake/dbms_glob_sources.cmake)

set (CMAKE_POSITION_INDEPENDENT_CODE ON)

add_library(global-group INTERFACE)
if (OS_LINUX OR OS_ANDROID)
include(cmake/linux/default_libs.cmake)
Expand Down Expand Up @@ -410,10 +412,6 @@ endif ()

set (CMAKE_POSTFIX_VARIABLE "CMAKE_${CMAKE_BUILD_TYPE_UC}_POSTFIX")

if (NOT SANITIZE)
set (CMAKE_POSITION_INDEPENDENT_CODE OFF)
endif()

if (OS_LINUX AND NOT (ARCH_AARCH64 OR ARCH_S390X) AND NOT SANITIZE)
# Slightly more efficient code can be generated
# It's disabled for ARM because otherwise ClickHouse cannot run on Android.
Expand Down Expand Up @@ -476,8 +474,10 @@ macro (clickhouse_add_executable target)
if (${type} STREQUAL EXECUTABLE)
# disabled for TSAN and gcc since libtsan.a provides overrides too
if (TARGET clickhouse_new_delete)
# operator::new/delete for executables (MemoryTracker stuff)
target_link_libraries (${target} PRIVATE clickhouse_new_delete)
if (NOT ${target} STREQUAL Git::Git)
# operator::new/delete for executables (MemoryTracker stuff)
target_link_libraries (${target} PRIVATE clickhouse_new_delete ${MALLOC_LIBRARIES})
endif()
endif()

# In case of static jemalloc, because zone_register() is located in zone.c and
Expand Down

0 comments on commit 79af00b

Please sign in to comment.