aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-ya-builder <robot-ya-builder@yandex-team.com>2023-09-13 19:29:28 +0300
committerrobot-ya-builder <robot-ya-builder@yandex-team.com>2023-09-13 21:04:43 +0300
commit679abdba654dae0ad578071d273b90e3cf8c32c0 (patch)
treecd9552f26403dda7b549b71a014c869bfc7cc01d
parentd7ec40e4e4dd22abff68d38c902650ec90a620d7 (diff)
downloadydb-679abdba654dae0ad578071d273b90e3cf8c32c0.tar.gz
External build system generator release 54
Update tools: yexport, os-yexport
-rw-r--r--build/external_resources/yexport/resources.json6
-rw-r--r--build/mapping.conf.json12
-rw-r--r--cmake/masm.cmake2
3 files changed, 10 insertions, 10 deletions
diff --git a/build/external_resources/yexport/resources.json b/build/external_resources/yexport/resources.json
index 7b2b16d363..23b0698af1 100644
--- a/build/external_resources/yexport/resources.json
+++ b/build/external_resources/yexport/resources.json
@@ -1,13 +1,13 @@
{
"by_platform": {
"darwin": {
- "uri": "sbr:5077386234"
+ "uri": "sbr:5080278512"
},
"darwin-arm64": {
- "uri": "sbr:5077395483"
+ "uri": "sbr:5080269967"
},
"linux": {
- "uri": "sbr:5077446856"
+ "uri": "sbr:5080277378"
}
}
}
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 61a29a1917..355761696b 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -70,9 +70,9 @@
"5054493005": "http://s3.mds.yandex.net/test-devtools-registry/5054493005",
"5054495063": "http://s3.mds.yandex.net/test-devtools-registry/5054495063",
"5054506271": "http://s3.mds.yandex.net/test-devtools-registry/5054506271",
- "5075956954": "http://s3.mds.yandex.net/test-devtools-registry/5075956954",
- "5075955130": "http://s3.mds.yandex.net/test-devtools-registry/5075955130",
- "5075964176": "http://s3.mds.yandex.net/test-devtools-registry/5075964176",
+ "5080278512": "http://s3.mds.yandex.net/test-devtools-registry/5080278512",
+ "5080269967": "http://s3.mds.yandex.net/test-devtools-registry/5080269967",
+ "5080277378": "http://s3.mds.yandex.net/test-devtools-registry/5080277378",
"5062909541": "http://s3.mds.yandex.net/test-devtools-registry/5062909541",
"5062909022": "http://s3.mds.yandex.net/test-devtools-registry/5062909022",
"5062911545": "http://s3.mds.yandex.net/test-devtools-registry/5062911545",
@@ -155,9 +155,9 @@
"5054493005": "ya-tc for darwin-arm64",
"5054495063": "ya-tc for linux",
"5054506271": "ya-tc for linux-aarch64",
- "5075956954": "yexport for darwin",
- "5075955130": "yexport for darwin-arm64",
- "5075964176": "yexport for linux",
+ "5080278512": "yexport for darwin",
+ "5080269967": "yexport for darwin-arm64",
+ "5080277378": "yexport for linux",
"5062909541": "ymake for darwin",
"5062909022": "ymake for darwin-arm64",
"5062911545": "ymake for linux",
diff --git a/cmake/masm.cmake b/cmake/masm.cmake
index f4d803dea7..1b64c71542 100644
--- a/cmake/masm.cmake
+++ b/cmake/masm.cmake
@@ -1,6 +1,6 @@
if (MSVC)
-enable_language(MASM)
+enable_language(ASM_MASM)
macro(curdir_masm_flags)
set(CMAKE_ASMMASM_FLAGS ${ARGN})