aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf
diff options
context:
space:
mode:
authorprettyboy <prettyboy@yandex-team.com>2023-08-18 11:46:03 +0300
committerprettyboy <prettyboy@yandex-team.com>2023-08-18 14:48:39 +0300
commit66149805acb62a8f0828a414e9c3362d0f532e2f (patch)
tree4f669234172185267cd8d80d0c597e999acc017c /build/conf
parent4b336ed3cc9479b9b99783e9967c7d4ef47d7c96 (diff)
downloadydb-66149805acb62a8f0828a414e9c3362d0f532e2f.tar.gz
Revert commit rXXXXXX, Make libclang.rt_profile depends on sources
Diffstat (limited to 'build/conf')
-rw-r--r--build/conf/linkers/ld.conf33
1 files changed, 4 insertions, 29 deletions
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index 8ad41c57ef..090328de1d 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -191,9 +191,8 @@ LINK_SCRIPT_EXE_FLAGS=
REAL_LINK_EXE_CMDLINE =\
$YMAKE_PYTHON ${input:"build/scripts/link_exe.py"} \
--source-root $ARCADIA_ROOT
-
-REAL_LINK_EXE_CMDLINE+=$_LD_LINKER_OUTPUT
-REAL_LINK_EXE_CMDLINE+=\
+ REAL_LINK_EXE_CMDLINE+=$_LD_LINKER_OUTPUT
+ REAL_LINK_EXE_CMDLINE+=\
${pre=--whole-archive-peers :WHOLE_ARCHIVE_PEERS} \
${pre=--whole-archive-libs :_WHOLE_ARCHIVE_LIBS_VALUE_GLOBAL} \
$_LD_ARCH_FLAG \
@@ -213,15 +212,6 @@ REAL_LINK_EXE_TIDY=\
$AUTO_INPUT \
$_LD_ENV_STYLE
-COPY_PROFILE_RUNTIME=\
- $YMAKE_PYTHON3 ${input:"build/scripts/copy_clang_profile_rt.py"} \
- --arch $TARGET_PLATFORM \
- --build-root $ARCADIA_BUILD_ROOT \
- --need-profile-rt $NEED_PROFILE_RUNTIME --
-COPY_PROFILE_RUNTIME+=\
- ${rootrel:PEERS} \
- $LDFLAGS
-
# Executable Shared Library
REAL_LINK_EXEC_DYN_LIB_CMDLINE =\
@@ -281,23 +271,8 @@ otherwise {
DWARF_COMMAND=$_DWARF_COMMAND
_REAL_LINK_EXE=$REAL_LINK_EXE_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE)
-_LINK_EXE=
-_LINK_EXE+=$GENERATE_MF
-_LINK_EXE+=&& $GENERATE_VCS_C_INFO_NODEP
-_LINK_EXE+=&& $COPY_PROFILE_RUNTIME
-_LINK_EXE+=&& $REAL_LINK_EXE
-_LINK_EXE+=&& $DWARF_COMMAND
-_LINK_EXE+=&& $LINK_ADDITIONAL_SECTIONS_COMMAND
-_LINK_EXE+=&& $PACK_IOS_CMD
-
-_LINK_DYN_LIB=
-_LINK_DYN_LIB+=$GENERATE_MF
-_LINK_DYN_LIB+=&& $GENERATE_VCS_C_INFO_NODEP
-_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_EXE=$GENERATE_MF && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_EXE && $DWARF_COMMAND && $LINK_ADDITIONAL_SECTIONS_COMMAND && $PACK_IOS_CMD
+_LINK_DYN_LIB=$GENERATE_MF && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_DYN_LIB && $DWARF_COMMAND && $LINK_ADDITIONAL_SECTIONS_COMMAND
when ($TIDY == "yes") {
_REAL_LINK_EXE=$REAL_LINK_EXE_TIDY
_LINK_EXE=$REAL_LINK_EXE