Merge branch 'rightlib' into mergelibs-240708-1553

1 files changed, 16 insertions, 9 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 522e2c234a..d11f242fe4 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -14,7 +14,7 @@ GO_FAKEID=11100371
 ANDROID_FAKEID=2023-05-17
 CLANG_TIDY_FAKEID=2023-06-06
 CYTHON_FAKE_ID=10784829
-JAVA_FAKEID=108490091
+JAVA_FAKEID=20240627
 PROTO_FAKEID=0
 FBS_FAKEID=2024-03-13
 
@@ -3204,9 +3204,12 @@ macro _SRC("f", SRC, SRCFLAGS...) {
     .ADDINCL=contrib/libs/libf2c
 }
 
+_SRC_CPP_TOOLCHAIN_INFO_PEER=
+
 # tag:src-processing
 macro _SRC("cpp", SRC, SRCFLAGS...) {
     .CMD=$_SRC_CPP_CMD_NEW
+    .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
 }
@@ -3214,6 +3217,7 @@ macro _SRC("cpp", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("cxx", SRC, SRCFLAGS...) {
     .CMD=$_SRC_CPP_CMD_NEW
+    .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
 }
@@ -3221,6 +3225,7 @@ macro _SRC("cxx", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("cc", SRC, SRCFLAGS...) {
     .CMD=$_SRC_CPP_CMD_NEW
+    .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
 }
@@ -3228,6 +3233,7 @@ macro _SRC("cc", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("auxcpp", SRC, SRCFLAGS...) {
     .CMD=$_SRC_CPP_CMD_NEW_FORCED
+    .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($_FORCE_CPP_FLAGS $SRCFLAGS)
     .STRUCT_CMD=yes
 }
@@ -3235,6 +3241,7 @@ macro _SRC("auxcpp", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("C", SRC, SRCFLAGS...) {
     .CMD=$_SRC_CPP_CMD_NEW
+    .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS)
     .STRUCT_CMD=yes
 }
@@ -3242,6 +3249,7 @@ macro _SRC("C", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("c", SRC, SRCFLAGS...) {
     .CMD=$_SRC_C_CMD_NEW
+    .PEERDIR=$_SRC_CPP_TOOLCHAIN_INFO_PEER
     .SEM=target_sources PRIVATE ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} && target_options-privates-ITEM && target_options-privates-option target_sources && target_options-privates-args ${input:SRC} ${hide;output;suf=${OBJ_SUF}.o:SRC} $_ADD_EXTRA_FLAGS($SRCFLAGS $USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL)
     .STRUCT_CMD=yes
 }
@@ -4690,14 +4698,6 @@ macro FROM_SANDBOX(Id, OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], I
     ADD_CHECK(check.resource $Id)
 }
 
-### @usage: FROM_MDS([FILE] key [RENAME <resource files>] OUT_[NOAUTO] <output files> [EXECUTABLE] [OUTPUT_INCLUDES <include files>] [INDUCED_DEPS $VARs...])
-###
-### Download resource from MDS with the specified key and process like [FROM_SANDBOX()](#macro_FROM_SANDBOX).
-macro FROM_MDS(Key, OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], INDUCED_DEPS[], FILE?"--copy-to-dir":"--untar-to", PREFIX=".", RENAME[], EXECUTABLE?"--executable":"") {
-    .CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/fetch_from_mds.py"} --key $Key $FILE $PREFIX ${pre=--rename :RENAME} $EXECUTABLE -- $OUT $OUT_NOAUTO ${hide;input:"build/scripts/fetch_from.py"} ${output_include;hide:OUTPUT_INCLUDES} $INDUCED_DEPS ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${requirements;hide:"network:full"} ${hide;kv:"p MD"} ${hide;kv:"pc yellow"} ${hide;kv:"show_out"}
-    ADD_CHECK(check.mds $Key)
-}
-
 ### @usage LARGE_FILES([AUTOUPDATED]  Files...)
 ###
 ### Use large file ether from working copy or from remote storage via placeholder <File>.external
@@ -5920,3 +5920,10 @@ macro CLANG_EMIT_AST_CXX_RUN_TOOL(SOURCES[], OPTS[], Tool, IN{input}[], IN_NOPAR
 macro _CONTRIB_MODULE_HOOKS() {
     ENABLE(UNUSED_MACRO)
 }
+
+
+### Specify that current module is used as toolchain. Allows to have contrib hooks for toolchain modules
+### defined in repo internal python plugins
+macro TOOLCHAIN(Name) {
+    ENABLE(UNUSED_MACRO)
+}