Browse Source

Fix RESOURCE_LIBRARY_SEM

Fix RESOURCE_LIBRARY_SEM
commit_hash:f26285b5a272c7f2b0a97d96dbc0cbc73c3c88de
dimdim11 2 months ago
parent
commit
c51abdbd59
1 changed files with 3 additions and 2 deletions
  1. 3 2
      build/ymake.core.conf

+ 3 - 2
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