aboutsummaryrefslogtreecommitdiffstats
path: root/build/platform
diff options
context:
space:
mode:
authorrobot-srch-releaser <robot-srch-releaser@yandex-team.com>2024-07-12 21:51:15 +0300
committerrobot-srch-releaser <robot-srch-releaser@yandex-team.com>2024-07-12 22:05:09 +0300
commit39ad63775e7d65ad1d3c2fc5389e830a94a6c243 (patch)
treebcc4886bc4a117f871fac0d6248cea6f9328dad8 /build/platform
parentef1c6569e8786b572ada95678ccdcfa9b61d2ec9 (diff)
downloadydb-39ad63775e7d65ad1d3c2fc5389e830a94a6c243.tar.gz
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
Diffstat (limited to 'build/platform')
-rw-r--r--build/platform/lld/lld16.json9
-rw-r--r--build/platform/lld/ya.make8
2 files changed, 9 insertions, 8 deletions
diff --git a/build/platform/lld/lld16.json b/build/platform/lld/lld16.json
index 2eb53e6bec..31e594fa2b 100644
--- a/build/platform/lld/lld16.json
+++ b/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"
}
}
}
+
diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make
index 670dd4e4cd..5cde9b0672 100644
--- a/build/platform/lld/ya.make
+++ b/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()