Browse Source

Rollback: rXXXXXX
[diff-resolver:robot-brewer]
Sandbox task: https://sandbox.yandex-team.ru/task/2440174210/view
Task author: robot-srch-releaser@
Commit was made by robot-srch-releaser@, but committer is igorock@
Description: Breaks builds https://st.yandex-team.ru/
[fix:yabs_server_ci:14415562]

Note: mandatory check (NEED_CHECK) was skipped
ebc0d955a771e80a382bf51c6fd9e5b8059d010c

robot-srch-releaser 8 months ago
parent
commit
39ad63775e
4 changed files with 10 additions and 17 deletions
  1. 0 8
      build/mapping.conf.json
  2. 5 4
      build/platform/lld/lld16.json
  3. 4 4
      build/platform/lld/ya.make
  4. 1 1
      build/ymake.core.conf

+ 0 - 8
build/mapping.conf.json

@@ -84,10 +84,6 @@
         "5709310220": "https://devtools-registry.s3.yandex.net/5709310220",
         "5709435327": "https://devtools-registry.s3.yandex.net/5709435327",
         "5758120203": "https://devtools-registry.s3.yandex.net/5758120203",
-        "6657744758": "https://devtools-registry.s3.yandex.net/6657744758",
-        "6657746696": "https://devtools-registry.s3.yandex.net/6657746696",
-        "6657765589": "https://devtools-registry.s3.yandex.net/6657765589",
-        "6657758332": "https://devtools-registry.s3.yandex.net/6657758332",
         "360916612": "https://devtools-registry.s3.yandex.net/360916612",
         "4312064267": "https://devtools-registry.s3.yandex.net/4312064267",
         "4312063561": "https://devtools-registry.s3.yandex.net/4312063561",
@@ -723,10 +719,6 @@
         "5709310220": "bin-gdb-reloc-ya-linux-x86_64-70970b31ef83c56b51291cd8fe4f24449b582b59",
         "5709435327": "bin-gdb-reloc-ya-linux-x86_64-70970b31ef83c56b51291cd8fe4f24449b582b59",
         "5758120203": "bin-gdb-reloc-ya-linux-x86_64-b544ce3aae71e89238d6b1b85032a6b6f6412369",
-        "6657744758": "bin-lld-16-optimized-darwin-arm64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
-        "6657746696": "bin-lld-16-optimized-darwin-x86_64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
-        "6657765589": "bin-lld-16-optimized-linux-aarch64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
-        "6657758332": "bin-lld-16-optimized-linux-x86_64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
         "360916612": "binutils 2.26 for linux_ubuntu_10.04_lucid",
         "4312064267": "black_linter for linux",
         "4312063561": "black_linter for linux-aarch64",

+ 5 - 4
build/platform/lld/lld16.json

@@ -1,16 +1,17 @@
 {
     "by_platform": {
         "darwin-arm64": {
-            "uri": "sbr:6657744758"
+            "uri": "sbr:5465946272"
         },
         "darwin-x86_64": {
-            "uri": "sbr:6657746696"
+            "uri": "sbr:5453803895"
         },
         "linux-aarch64": {
-            "uri": "sbr:6657765589"
+            "uri": "sbr:5458408674"
         },
         "linux-x86_64": {
-            "uri": "sbr:6657758332"
+            "uri": "sbr:5463300202"
         }
     }
 }
+

+ 4 - 4
build/platform/lld/ya.make

@@ -39,7 +39,7 @@ IF (OS_ANDROID)
 ELSEIF (OS_LINUX)
     LDFLAGS(
         -fuse-ld=lld
-        --ld-path=${LLD_ROOT_RESOURCE_GLOBAL}/bin/ld.lld
+        --ld-path=${LLD_ROOT_RESOURCE_GLOBAL}/ld.lld
 
         # dynlinker on auld ubuntu versions can not handle .rodata stored in standalone segment [citation needed]
         -Wl,--no-rosegment
@@ -49,21 +49,21 @@ ELSEIF (OS_LINUX)
 ELSEIF (OS_DARWIN OR OS_IOS)
     IF (MAPSMOBI_BUILD_TARGET AND XCODE)
         LDFLAGS(
-            -fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/bin/ld64.lld
+            -fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/ld64.lld
         )
     ELSEIF (XCODE)
         LDFLAGS(-DYA_XCODE)
     ELSE()
         LDFLAGS(
             -fuse-ld=lld
-            --ld-path=${LLD_ROOT_RESOURCE_GLOBAL}/bin/ld64.lld
+            --ld-path=${LLD_ROOT_RESOURCE_GLOBAL}/ld64.lld
             # FIXME: Remove fake linker version flag when clang 16 version arrives
             -mlinker-version=705
         )
     ENDIF()
 ELSEIF (OS_EMSCRIPTEN)
     LDFLAGS(
-        -fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/bin/wasm-ld
+        -fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/wasm-ld
         # FIXME: Linker does not capture "ld-path" and therefore it can not find "wasm-ld"
     )
 ENDIF()

+ 1 - 1
build/ymake.core.conf

@@ -4815,7 +4815,7 @@ when($OS_LINUX) {
 ### Emit eBPF bytecode from .c file.
 ### Note: Output name is used as is, no extension added.
 macro BPF_STATIC(Input, Output, Opts...) {
-    .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_RESOURCE_GLOBAL}/bin/clang ${pre=-I:_C__INCLUDE} $C_FLAGS_PLATFORM -target bpf -c ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p BP"} ${hide;kv:"pc light-green"} && ${cwd:BINDIR} $LLD_ROOT_RESOURCE_GLOBAL/bin/$LD_BINARY_NAME -r -b binary -m elf_x86_64 -o ${noauto;output;suf=.bpf.o:Input} ${noauto;nopath:Output}
+    .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_RESOURCE_GLOBAL}/bin/clang ${pre=-I:_C__INCLUDE} $C_FLAGS_PLATFORM -target bpf -c ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p BP"} ${hide;kv:"pc light-green"} && ${cwd:BINDIR} $LLD_ROOT_RESOURCE_GLOBAL/$LD_BINARY_NAME -r -b binary -m elf_x86_64 -o ${noauto;output;suf=.bpf.o:Input} ${noauto;nopath:Output}
     PEERDIR(build/platform/clang build/platform/lld)
 }