diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
| commit | 40811e93f3fdf9342a9295369994012420fac548 (patch) | |
| tree | a8d85e094a9c21e10aa250f537c101fc2016a049 /build/conf | |
| parent | 30ebe5357bb143648c6be4d151ecd4944af81ada (diff) | |
| parent | 28a0c4a9f297064538a018c512cd9bbd00a1a35d (diff) | |
| download | ydb-40811e93f3fdf9342a9295369994012420fac548.tar.gz | |
Merge branch 'rightlib' into mergelibs-241016-1210
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/java.conf | 6 | ||||
| -rw-r--r-- | build/conf/linkers/ld.conf | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 5dc361a3b1..e39b34818e 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -1833,12 +1833,6 @@ MANAGED_PEERS_CLOSURE= MANAGEABLE_PEERS_ROOTS=contrib/java HAS_MANAGEABLE_PEERS=no PROPAGATES_MANAGEABLE_PEERS=no -# All items of this list must be PEERS, GHOST PEERS or TOOLS of the test module or module itself. -# All items of this list must has at least one of HAS_MANAGEABLE_PEERS or PROPAGATES_MANAGEABLE_PEERS flags set yes. -# This variable is used by JUnit tests but not TestNG. -TEST_CLASSPATH_VALUE= -# Calculated and replaced by ymake can be used in DART DATA -TEST_CLASSPATH_MANAGED= # tag:java-specific DEPENDENCY_MANAGEMENT_VALUE= diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index d7c63cf4df..afaaa1cb42 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -294,6 +294,7 @@ DWARF_COMMAND=$_DWARF_COMMAND _REAL_LINK_EXE=$REAL_LINK_EXE_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE) _EXTRA_OBJS= _GENERATE_EXTRA_OBJS= +_EXTRA_LINK_CMD= _LINK_EXE= _LINK_EXE+=$GENERATE_MF @@ -304,6 +305,7 @@ _LINK_EXE+=&& $REAL_LINK_EXE _LINK_EXE+=&& $DWARF_COMMAND _LINK_EXE+=&& $LINK_ADDITIONAL_SECTIONS_COMMAND _LINK_EXE+=&& $PACK_IOS_CMD +_LINK_EXE+=&& $_EXTRA_LINK_CMD _LINK_DYN_LIB= _LINK_DYN_LIB+=$GENERATE_MF @@ -313,6 +315,7 @@ _LINK_DYN_LIB+=&& $COPY_PROFILE_RUNTIME _LINK_DYN_LIB+=&& $REAL_LINK_DYN_LIB _LINK_DYN_LIB+=&& $DWARF_COMMAND _LINK_DYN_LIB+=&& $LINK_ADDITIONAL_SECTIONS_COMMAND +_LINK_DYN_LIB+=&& $_EXTRA_LINK_CMD when ($TIDY == "yes") { _REAL_LINK_EXE=$REAL_LINK_EXE_TIDY |