aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimdim11 <dimdim11@yandex-team.com>2024-12-13 12:04:25 +0300
committerdimdim11 <dimdim11@yandex-team.com>2024-12-13 12:23:44 +0300
commitc51abdbd596f06b9580e928ce0d44015f2fa2fcc (patch)
tree60d4d8733519272b0c492e2eaa070b9a1c55ebf2
parent8ab4ecc8f6b38cb40a0538c26f53abd3343094f3 (diff)
downloadydb-c51abdbd596f06b9580e928ce0d44015f2fa2fcc.tar.gz
Fix RESOURCE_LIBRARY_SEM
Fix RESOURCE_LIBRARY_SEM commit_hash:f26285b5a272c7f2b0a97d96dbc0cbc73c3c88de
-rw-r--r--build/ymake.core.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index b15ba40d93..b37c8a6e2f 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1914,6 +1914,7 @@ macro _CONDITIONAL_SRCS(USE_CONDITIONAL_SRCS[], DYMMY...) {
# XXX: dirty hack for correct LDFLAGS passing
RESOURCES_LIBRARY_LINK=$TOUCH_UNIT
+_RESOURCES_LIBRARY_SEM=IGNORED
### @usage: RESOURCES_LIBRARY()
###
@@ -1923,7 +1924,7 @@ RESOURCES_LIBRARY_LINK=$TOUCH_UNIT
### @see: [DECLARE_EXTERNAL_RESOURCE()](#macro_DECLARE_EXTERNAL_RESOURCE)
module RESOURCES_LIBRARY: _BARE_UNIT {
.CMD=RESOURCES_LIBRARY_LINK
- .SEM=_SEM_IGNORED
+ .SEM=_RESOURCES_LIBRARY_SEM
.ALLOWED=DECLARE_EXTERNAL_RESOURCE EXTRALIBS OBJADDE_GLOBAL
.RESTRICTED=ALLOCATOR SIZE TAG DATA TEST_DATA DEPENDS FORK_TESTS FORK_SUBTESTS SPLIT_FACTOR TEST_CWD RUN TIMEOUT SRC SRCS SPLIT_DWARF
.ALIASES=EXTRALIBS=PY_EXTRALIBS
@@ -1937,7 +1938,7 @@ module RESOURCES_LIBRARY: _BARE_UNIT {
SET(PEERDIR_TAGS RESOURCE_LIB)
when ($CMAKE_PACKAGE_SEM != "" || $CONAN_REQUIRES_SEM != "" || $CONAN_OPTS_SEM != "" || $CONAN_OS_REQUIRES_SEM != "" || $CONAN_OS_OPTIONS_SEM != "") {
- RESOURCES_LIBRARY_SEM=$CMAKE_PACKAGE_SEM && ${CPP_LIBRARY_INDUCED_LINKS} $CMAKE_LINK_TARGET $CONAN_REQUIRES_SEM $CONAN_OPTIONS_SEM $CONAN_OS_REQUIRES_SEM $CONAN_OS_OPTIONS_SEM && IGNORED
+ _RESOURCES_LIBRARY_SEM=$CMAKE_PACKAGE_SEM && ${CPP_LIBRARY_INDUCED_LINKS} $CMAKE_LINK_TARGET $CONAN_REQUIRES_SEM $CONAN_OPTIONS_SEM $CONAN_OS_REQUIRES_SEM $CONAN_OS_OPTIONS_SEM && IGNORED
}
MODULE_SUFFIX=.pkg.fake