mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-24 02:30:51 +00:00
Internal compiler: write versions in header version mismatch message (using magic)
use same debug/release flags
This commit is contained in:
parent
971df7b853
commit
38343f7649
@ -20,7 +20,7 @@ set (INTERNAL_COMPILER_HEADERS "${PATH_SHARE}/clickhouse/headers" CACHE STRING "
|
|||||||
set (INTERNAL_COMPILER_HEADERS_ROOT "${INTERNAL_COMPILER_HEADERS}" CACHE STRING "")
|
set (INTERNAL_COMPILER_HEADERS_ROOT "${INTERNAL_COMPILER_HEADERS}" CACHE STRING "")
|
||||||
set (INTERNAL_COMPILER_CUSTOM_ROOT ON CACHE INTERNAL "")
|
set (INTERNAL_COMPILER_CUSTOM_ROOT ON CACHE INTERNAL "")
|
||||||
|
|
||||||
set (INTERNAL_COMPILER_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} ${CXX_FLAGS_INTERNAL_COMPILER} -x c++ -march=native -fPIC -fvisibility=hidden -fno-implement-inlines -nostdinc -nostdinc++ -Wno-unused-command-line-argument -Bprefix=${PATH_SHARE}/clickhouse -isysroot=${INTERNAL_COMPILER_HEADERS_ROOT}" CACHE STRING "")
|
set (INTERNAL_COMPILER_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UC}} ${CXX_FLAGS_INTERNAL_COMPILER} -x c++ -march=native -fPIC -fvisibility=hidden -fno-implement-inlines -nostdinc -nostdinc++ -Wno-unused-command-line-argument -Bprefix=${PATH_SHARE}/clickhouse -isysroot=${INTERNAL_COMPILER_HEADERS_ROOT}" CACHE STRING "")
|
||||||
string(REPLACE "-no-pie" "" INTERNAL_COMPILER_FLAGS ${INTERNAL_COMPILER_FLAGS})
|
string(REPLACE "-no-pie" "" INTERNAL_COMPILER_FLAGS ${INTERNAL_COMPILER_FLAGS})
|
||||||
if (INTERNAL_COMPILER_NO_WARNING)
|
if (INTERNAL_COMPILER_NO_WARNING)
|
||||||
string (REPLACE "-Wall" "" INTERNAL_COMPILER_FLAGS ${INTERNAL_COMPILER_FLAGS})
|
string (REPLACE "-Wall" "" INTERNAL_COMPILER_FLAGS ${INTERNAL_COMPILER_FLAGS})
|
||||||
|
@ -185,9 +185,12 @@ SharedLibraryPtr Compiler::getOrCount(
|
|||||||
static void addCodeToAssertHeadersMatch(WriteBuffer & out)
|
static void addCodeToAssertHeadersMatch(WriteBuffer & out)
|
||||||
{
|
{
|
||||||
out <<
|
out <<
|
||||||
|
"#define STRING2(x) #x\n"
|
||||||
|
"#define STRING(x) STRING2(x)\n"
|
||||||
"#include <Common/config_version.h>\n"
|
"#include <Common/config_version.h>\n"
|
||||||
"#if VERSION_REVISION != " << ClickHouseRevision::get() << "\n"
|
"#if VERSION_REVISION != " << ClickHouseRevision::get() << "\n"
|
||||||
"#error \"ClickHouse headers revision doesn't match runtime revision of the server.\"\n"
|
"#pragma message \"ClickHouse headers revision = \" STRING(VERSION_REVISION) \n"
|
||||||
|
"#error \"ClickHouse headers revision doesn't match runtime revision of the server (" << ClickHouseRevision::get() << ").\"\n"
|
||||||
"#endif\n\n";
|
"#endif\n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user