diff options
author | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-03-20 16:31:37 +0300 |
---|---|---|
committer | robot-ya-builder <robot-ya-builder@yandex-team.com> | 2023-03-20 16:31:37 +0300 |
commit | c8b7f84d9c4a39d7f576931850f269c560906f2b (patch) | |
tree | 3e72ec19053d46124efc0de0bc96c924ee15a30a | |
parent | 2885c952c6522d0795d8cf72cccfe4d22c04e462 (diff) | |
download | ydb-c8b7f84d9c4a39d7f576931850f269c560906f2b.tar.gz |
External build system generator release 22
Update tools: yexport
-rw-r--r-- | cmake/conan-profiles/linux.aarch64.profile | 15 | ||||
-rw-r--r-- | cmake/global_flags.compiler.msvc.cmake | 7 |
2 files changed, 13 insertions, 9 deletions
diff --git a/cmake/conan-profiles/linux.aarch64.profile b/cmake/conan-profiles/linux.aarch64.profile index bdb16107aa..6945b1d777 100644 --- a/cmake/conan-profiles/linux.aarch64.profile +++ b/cmake/conan-profiles/linux.aarch64.profile @@ -5,9 +5,9 @@ target_host=aarch64-linux-gnu [settings] arch=armv8 build_type=Release -compiler=clang -compiler.libcxx=libc++ -compiler.version=14 +compiler=gcc +compiler.libcxx=libstdc++11 +compiler.version=12 compiler.cppstd=20 os=Linux [options] @@ -15,10 +15,11 @@ os=Linux [env] CONAN_CMAKE_FIND_ROOT_PATH=/usr/$target_host CONAN_CMAKE_SYSROOT=/usr/$target_host -CC=clang -CXX=clang++ -CXXFLAGS="-I/usr/$target_host/include/ -target $target_host" -CFLAGS="-I/usr/$target_host/include/ -target $target_host" +SYSROOT=/usr/$target_host +CC=$target_host-gcc +CXX=$target_host-g++ +CXXFLAGS="-I/usr/$target_host/include/" +CFLAGS="-I/usr/$target_host/include/" CHOST=$target_host AR=$target_host-ar AS=$target_host-as diff --git a/cmake/global_flags.compiler.msvc.cmake b/cmake/global_flags.compiler.msvc.cmake index 4c08895cde..1f22f3aa5d 100644 --- a/cmake/global_flags.compiler.msvc.cmake +++ b/cmake/global_flags.compiler.msvc.cmake @@ -138,5 +138,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_MSVC_COMMON_C_CXX_FLAGS} \ /std:c++latest \ /Zc:__cplusplus \ ") -set(CMAKE_CXX_FLAGS_DEBUG "/Z7") -set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Z7") + +set(CMAKE_CXX_FLAGS_DEBUG "/Z7 /Ob0 /Od /D_DEBUG") +set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "/Ox /Ob2 /Oi /DNDEBUG") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Z7 /Ox /Ob1 /DNDEBUG") |