diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2025-02-14 00:51:34 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2025-02-14 00:51:34 +0000 |
| commit | 7c59c24919f9e86614d1cd19c62829e01dd54097 (patch) | |
| tree | d42e64eb38c0388a0f4f3ad148bad8938324e279 /build/conf | |
| parent | 28180f60aec6dcb2b662b6417c90226553ebe2dc (diff) | |
| parent | c26bb8abd161c590e8cb0e7280a14c335c1eb893 (diff) | |
| download | ydb-7c59c24919f9e86614d1cd19c62829e01dd54097.tar.gz | |
Merge branch 'rightlib' into merge-libs-250214-0050
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/java.conf | 1 | ||||
| -rw-r--r-- | build/conf/linkers/ld.conf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index bc18623f91..dbc53bb371 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -1850,7 +1850,6 @@ MANAGED_PEERS= MANAGED_PEERS_CLOSURE= MANAGEABLE_PEERS_ROOTS=contrib/java HAS_MANAGEABLE_PEERS=no -PROPAGATES_MANAGEABLE_PEERS=no # tag:java-specific DEPENDENCY_MANAGEMENT_VALUE= diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index 79006c21ab..fecd6699cc 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -244,6 +244,7 @@ REAL_LINK_EXEC_DYN_LIB_CMDLINE =\ $YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \ ${hide;input:"build/scripts/link_exe.py"} \ --target $TARGET +REAL_LINK_EXEC_DYN_LIB_CMDLINE+=--start-plugins ${ext=.pyplugin:SRCS_GLOBAL} --end-plugins REAL_LINK_EXEC_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT REAL_LINK_EXEC_DYN_LIB_CMDLINE+=\ $_ROOT_FLAGS \ @@ -271,6 +272,7 @@ REAL_LINK_DYN_LIB_CMDLINE =\ $YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \ ${hide;input:"build/scripts/link_exe.py"} \ --target $TARGET +REAL_LINK_DYN_LIB_CMDLINE+=--start-plugins ${ext=.pyplugin:SRCS_GLOBAL} --end-plugins REAL_LINK_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT REAL_LINK_DYN_LIB_CMDLINE+=\ ${pre=--whole-archive-peers :WHOLE_ARCHIVE_PEERS} \ |