aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-10 17:56:32 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-10 17:56:32 +0300
commit9829a99c90ae1830058427f6a7ee0a7640252103 (patch)
treef6beefd5283b82525be1cd83cdf76a0fbadd8c73
parent4d80d317f1de5ac3f37b2ffa9a59f7ce27ee30fb (diff)
downloadydb-9829a99c90ae1830058427f6a7ee0a7640252103.tar.gz
intermediate changes
ref:2b4380aa8e60fb9dec3e185abd8e6894dbbfbbdf
-rw-r--r--build/platform/clang/ya.make26
-rw-r--r--build/ya.conf.json4
2 files changed, 10 insertions, 20 deletions
diff --git a/build/platform/clang/ya.make b/build/platform/clang/ya.make
index 342b928637..48c2b622c2 100644
--- a/build/platform/clang/ya.make
+++ b/build/platform/clang/ya.make
@@ -1,24 +1,14 @@
RESOURCES_LIBRARY()
-LICENSE(BSD-3-Clause)
-
OWNER(g:contrib)
-IF (CLANG10BC AND CLANG10 AND HOST_OS_LINUX)
- DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
- CLANG # Clang 10
- sbr:1871274282 FOR LINUX
- sbr:1844539535 FOR DARWIN
- )
-ELSE()
- # 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
- )
-ENDIF()
+# 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
+)
END()
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 95d2494658..02a60e2cd7 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -6827,7 +6827,7 @@
"yp-util": {
"formula": {
"sandbox_id": [
- 1204918529
+ 1211019862
],
"match": "yp_util"
},
@@ -6840,7 +6840,7 @@
"yp": {
"formula": {
"sandbox_id": [
- 1204919943
+ 1211021695
],
"match": "YP"
},