Add Python implementation of EXTRALIBS

1 files changed, 8 insertions, 6 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index d14fb74fc1..2094e110fa 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -1047,7 +1047,7 @@ macro ADD_CLANG_TIDY() {
 module _BASE_PROGRAM: _LINK_UNIT {
     .SYMLINK_POLICY=EXE
     .ALLOWED=INDUCED_DEPS WHOLE_ARCHIVE
-    .GLOBAL=LDFLAGS _WHOLE_ARCHIVE_LIBS_VALUE RPATH
+    .GLOBAL=LDFLAGS _WHOLE_ARCHIVE_LIBS_VALUE RPATH OBJADDE_LIB
     SET(MODULE_TYPE PROGRAM)
     SET(MODULE_LANG CPP)
     FORCE_COVERAGE_ENABLED=yes
@@ -1132,7 +1132,7 @@ module _BASE_PROGRAM: _LINK_UNIT {
 VCS_INFO_SEM=vcs_info ${input;hide:"build/scripts/vcs_info.py"} ${input;hide:"build/scripts/c_templates/svn_interface.c"} ${input;hide:"build/scripts/c_templates/svnversion.h"}
 CPP_PROGRAM_SEM=add_executable $MODDIR $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:AUTO_INPUT} $CMAKE_TARGET_ARTEFACT_RENAME_RULES \
                 && ${VCS_INFO_SEM} \
-                && target_link_options PRIVATE $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE \
+                && target_link_options PRIVATE $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE \
                 && target_include_directories PRIVATE $_C__INCLUDE_OWNED \
                 && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS \
                 && target_compile_options PRIVATE $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW
@@ -1142,6 +1142,7 @@ CPP_PROGRAM_SEM=add_executable $MODDIR $CMAKE_TARGET_NAME ${hide:TARGET} ${hide:
 ### If name is not specified it will be generated from the name of the containing project directory.
 module PROGRAM: _BASE_PROGRAM {
     .SEM=CPP_PROGRAM_SEM
+    .ALIASES=EXTRALIBS=PY_EXTRALIBS
 
     ADD_YTEST($MODULE_PREFIX$REALPRJNAME coverage.extractor)
     ADD_CLANG_TIDY()
@@ -1691,7 +1692,7 @@ module _LIBRARY: _BASE_UNIT {
     .PEERDIR_POLICY=as_include
     .EXTS=.o .obj .a .mf .supp .tidyjson .ld .lib
     .ALLOWED=GRPC USE_SKIFF EXTRALIBS OBJADDE_GLOBAL RESOURCE_FILES
-    .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS SRCS _WHOLE_ARCHIVE_LIBS_VALUE RPATH
+    .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS SRCS _WHOLE_ARCHIVE_LIBS_VALUE RPATH OBJADDE_LIB
     .RESTRICTED=ALLOCATOR SIZE TAG DATA TEST_DATA DEPENDS FORK_TESTS FORK_SUBTESTS SPLIT_FACTOR TEST_CWD RUN TIMEOUT SPLIT_DWARF
     .FINAL_TARGET=no
     .GLOBAL_CMD=GLOBAL_LINK_LIB
@@ -1775,6 +1776,7 @@ CONAN_OPTS_SEM=
 module LIBRARY: _LIBRARY {
     .GLOBAL=_AARS _PROGUARD_RULES
     .SEM=CPP_LIBRARY_SEM
+    .ALIASES=EXTRALIBS=PY_EXTRALIBS
     .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
     .DEFAULT_NAME_GENERATOR=ThreeDirNames
     .ARGS_PARSER=Base
@@ -1858,7 +1860,7 @@ module RESOURCES_LIBRARY: _BARE_UNIT {
     .NODE_TYPE=Library
     .PEERDIR_POLICY=as_include
     .EXTS=.o .obj .a .mf .supp .tidyjson .ld .lib
-    .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS _WHOLE_ARCHIVE_LIBS_VALUE RPATH
+    .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS _WHOLE_ARCHIVE_LIBS_VALUE RPATH OBJADDE_LIB
 
     when ($CMAKE_PACKAGE_COMPONENT != "") {
         CMAKE_FIND_PKG_COMP=COMPONENTS $CMAKE_PACKAGE_COMPONENT
@@ -1963,7 +1965,7 @@ _SONAME=
 _EXPORT_SCRIPT_SEM=
 _CLEAN_TEXTREL=
 macro _ADD_DYNLYB_SEM(Libname) {
-    .SEM=add_shared_library ${MODDIR} ${Libname} ${hide:TARGET} ${hide:AUTO_INPUT} && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL && target_include_directories PRIVATE $_C__INCLUDE_OWNED && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && target_compile_options PUBLIC $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && target_link_options PRIVATE $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE && ${VCS_INFO_SEM} $_EXPORT_SCRIPT_SEM
+    .SEM=add_shared_library ${MODDIR} ${Libname} ${hide:TARGET} ${hide:AUTO_INPUT} && target_include_directories PUBLIC $_C__INCLUDE_GLOBAL && target_include_directories PRIVATE $_C__INCLUDE_OWNED && target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && target_compile_options PUBLIC $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && target_link_options PRIVATE $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE && ${VCS_INFO_SEM} $_EXPORT_SCRIPT_SEM
 }
 CPP_DYN_LIBRARY_SEM=$_ADD_DYNLYB_SEM($CMAKE_TARGET_NAME) $CMAKE_TARGET_ARTEFACT_RENAME_RULES
 
@@ -1980,7 +1982,7 @@ module DLL_UNIT: _LINK_UNIT {
     .SEM=CPP_DYN_LIBRARY_SEM
     .NODE_TYPE=Library
     .SYMLINK_POLICY=SO
-    .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS _WHOLE_ARCHIVE_LIBS_VALUE RPATH
+    .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS _WHOLE_ARCHIVE_LIBS_VALUE RPATH OBJADDE_LIB
     .ALLOWED=WHOLE_ARCHIVE
     .DEFAULT_NAME_GENERATOR=TwoDirNames
     .ARGS_PARSER=DLL