aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Yurchuk <Maxim.Yurchuk@kaspersky.com>2023-09-12 19:26:56 +0300
committeralexv-smirnov <alex@ydb.tech>2023-09-12 20:27:37 +0300
commit60f706936ad7782fa57e021b0629fc79ca52a9a8 (patch)
tree521fc52a25106cda4d575944f52e9dd4fe3ed113
parent2a2bcd52988e79127e66ac6fbd95b5efdfd331ab (diff)
downloadydb-60f706936ad7782fa57e021b0629fc79ca52a9a8.tar.gz
Make ccache and ordinary options same
Make ccache and ordinary options same Pull Request resolved: 359
-rw-r--r--clang.toolchain11
1 files changed, 4 insertions, 7 deletions
diff --git a/clang.toolchain b/clang.toolchain
index 71d241b34f..661ccb7b00 100644
--- a/clang.toolchain
+++ b/clang.toolchain
@@ -7,13 +7,10 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "-lc -lm")
if (CCACHE_PATH)
set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PATH}" CACHE STRING "C++ compiler launcher")
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PATH}" CACHE STRING "C compiler launcher")
-
- # TODO: change ydb/.github/prewarm/build.sh in order to remove the difference with non-cache builds
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -UNDEBUG" CACHE STRING "C++ compiler flags")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -UNDEBUG" CACHE STRING "C compiler flags")
-else()
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -UNDEBUG" CACHE STRING "C++ compiler flags")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG" CACHE STRING "C compiler flags")
endif()
+
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -UNDEBUG" CACHE STRING "C++ compiler flags")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG" CACHE STRING "C compiler flags")
+
set(ENV{CC} clang-14)
set(ENV{CXX} clang++-14)