diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-17 14:53:16 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-17 14:53:16 +0300 |
| commit | f73077818301f4a6c0e70447ea4f1d2af45a1b0c (patch) | |
| tree | d1ed140f99f9b782d2a9db471e6e4bca6a9ebeae | |
| parent | aec65a1eb29e1964c22344468c9de23752202b38 (diff) | |
| download | ydb-f73077818301f4a6c0e70447ea4f1d2af45a1b0c.tar.gz | |
intermediate changes
ref:4132c96e8f4eeeb155232d5e9663a724d141e14c
| -rw-r--r-- | build/platform/clang/ya.make | 11 | ||||
| -rw-r--r-- | build/ymake.core.conf | 4 | ||||
| -rw-r--r-- | contrib/python/ya.make | 1 |
3 files changed, 8 insertions, 8 deletions
diff --git a/build/platform/clang/ya.make b/build/platform/clang/ya.make index 48c2b622c2..a3b38947fb 100644 --- a/build/platform/clang/ya.make +++ b/build/platform/clang/ya.make @@ -2,13 +2,12 @@ RESOURCES_LIBRARY() OWNER(g:contrib) -# Remove -std=c++17 flag from LLVM_COMPILE_CXX and CLANG_EMIT_AST_CXX macro when update clang to 11 -# DEVTOOLS-7845 DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE( - CLANG # Clang 7 - sbr:707372498 FOR LINUX # In 942524429 and 958916803 llvm-link does not run. - sbr:942053644 FOR DARWIN - sbr:1006151596 FOR WIN32 # Generated by ./clang-windows.sh 7.1.0 + CLANG # Clang 11.1.0 + sbr:1886578148 FOR LINUX + sbr:2214542408 FOR DARWIN + sbr:2214720943 FOR DARWIN-ARM64 + sbr:2062930743 FOR WIN32 ) END() diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 8bc920940a..1080bfb3db 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -7261,7 +7261,7 @@ macro GENERATED_SRCS(PARSE_META_FROM{input}[], OUTPUT_INCLUDES[], OPTIONS[], TEM ### Emit Clang AST from .cpp file. CXXFLAGS and LLVM_OPTS are passed in, while CFLAGS and C_FLAGS_PLATFORM are not. ### Note: Output name is used as is, no extension added. macro CLANG_EMIT_AST_CXX(Input, Output, Opts...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $CXXFLAGS -Wno-unknown-warning-option $LLVM_OPTS -std=c++17 -fno-lto -emit-ast -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p ST"} ${kv;hide:"pc light-green"} + .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $CXXFLAGS -Wno-unknown-warning-option $LLVM_OPTS -fno-lto -emit-ast -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p ST"} ${kv;hide:"pc light-green"} PEERDIR(build/platform/clang) } @@ -7270,7 +7270,7 @@ macro CLANG_EMIT_AST_CXX(Input, Output, Opts...) { ### Emit LLVM bytecode from .cpp file. BC_CXXFLAGS, LLVM_OPTS and C_FLAGS_PLATFORM are passed in, while CFLAGS are not. ### Note: Output name is used as is, no extension added. macro LLVM_COMPILE_CXX(Input, Output, Opts...) { - .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $BC_CXXFLAGS $C_FLAGS_PLATFORM -Wno-unknown-warning-option $LLVM_OPTS -std=c++17 -fno-lto -emit-llvm -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BC"} ${kv;hide:"pc light-green"} + .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS $CLANG_ROOT/bin/clang++ ${pre=-I:_C__INCLUDE} $BC_CXXFLAGS $C_FLAGS_PLATFORM -Wno-unknown-warning-option $LLVM_OPTS -fno-lto -emit-llvm -c ${input:Input} -o ${output;noauto:Output} $Opts ${kv;hide:"p BC"} ${kv;hide:"pc light-green"} PEERDIR(build/platform/clang) } diff --git a/contrib/python/ya.make b/contrib/python/ya.make index 37f5e24da8..290cd426b6 100644 --- a/contrib/python/ya.make +++ b/contrib/python/ya.make @@ -325,6 +325,7 @@ RECURSE( dpath dpkt drf-extensions + drf-spectacular drf_ujson drf-yasg easywebdav |