diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2025-07-30 07:56:13 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2025-07-30 08:10:19 +0300 |
| commit | 4dd62df137ad534db34eaa25ad0b5571ebbc3dcb (patch) | |
| tree | b8087b2acf31ce0f31851a20d43b8a953bedb5a3 | |
| parent | c457d90fa25be9d72682ec00cb6558d591f9c901 (diff) | |
| download | ydb-4dd62df137ad534db34eaa25ad0b5571ebbc3dcb.tar.gz | |
Add SBOM to ELF with linker independent target postprocessing
commit_hash:3a3efe1a000b5cc39b1f22eab5b38257de13a38b
| -rw-r--r-- | build/conf/go.conf | 1 | ||||
| -rw-r--r-- | build/conf/linkers/ld.conf | 1 | ||||
| -rw-r--r-- | build/ymake.core.conf | 10 |
3 files changed, 8 insertions, 4 deletions
diff --git a/build/conf/go.conf b/build/conf/go.conf index 8ce2781d12f..9e9ed9e072d 100644 --- a/build/conf/go.conf +++ b/build/conf/go.conf @@ -260,6 +260,7 @@ GO_LINK_EXE+=&& $GENERATE_VCS_C_INFO_NODEP GO_LINK_EXE+=&& $GENERATE_VCS_GO_INFO_NODEP GO_LINK_EXE+=&& $_GENERATE_EXTRA_OBJS GO_LINK_EXE+=&& $_GO_LINK_EXE_IMPL($_GO_SRCS_VALUE CGO_FILES $_CGO_SRCS_VALUE EXTRA_TEXT_INPUTS $_GO_EMBED_INPUTS) +GO_LINK_EXE+=&& $LINK_ADDITIONAL_SECTIONS_COMMAND GO_LINK_TEST= GO_LINK_TEST+=$GENERATE_VCS_C_INFO_NODEP diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index 624ef9fa70d..0c9261a149c 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -307,7 +307,6 @@ _REAL_LINK_EXE=$REAL_LINK_EXE_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE) _EXTRA_OBJS= _GENERATE_EXTRA_OBJS= _EXTRA_LINK_CMD= -LINK_ADDITIONAL_SECTIONS_COMMAND=$IF(${not;empty:LINK_ADDITIONAL_SECTIONS} THEN $OBJCOPY_TOOL $LINK_ADDITIONAL_SECTIONS $TARGET) _LINK_EXE= _LINK_EXE+=$GENERATE_MF diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 8da1d2fa303..5b6a89c7dbd 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -835,7 +835,11 @@ macro USE_LINKER_GOLD() { } COMMON_LINK_SETTINGS= -LINK_ADDITIONAL_SECTIONS= +_LINKER_CREF_SECTION= +_LINKER_MAP_SECTION= + +LINK_ADDITIONAL_SECTIONS=$_LINKER_CREF_SECTION $_LINKER_MAP_SECTION +LINK_ADDITIONAL_SECTIONS_COMMAND=$IF(${not;empty:LINK_ADDITIONAL_SECTIONS} THEN $OBJCOPY_TOOL $LINK_ADDITIONAL_SECTIONS $TARGET) when ($COMMON_LINK_SETTINGS == "yes") { when ($_LINKER_ID == "lld" && ($OS_LINUX == "yes" || $OS_ANDROID == "yes")) { @@ -844,7 +848,7 @@ when ($COMMON_LINK_SETTINGS == "yes") { when ($EMBED_LINKER_CREF == "yes") { LDFLAGS+=-Wl,--cref ${stdout;tmp;pre=$BINDIR/$MODULE_PREFIX;suf=.ldcref:REALPRJNAME} -Wl,--no-demangle - LINK_ADDITIONAL_SECTIONS+=--add-section=.ya.linker_cref=${pre=$BINDIR/$MODULE_PREFIX;suf=.ldcref:REALPRJNAME} + _LINKER_CREF_SECTION=--add-section=.ya.linker_cref=${pre=$BINDIR/$MODULE_PREFIX;suf=.ldcref:REALPRJNAME} } elsewhen ($DUMP_LINKER_CREF == "yes") { LDFLAGS+=-Wl,--cref ${stdout;output;pre=$MODULE_PREFIX;suf=.ldcref:REALPRJNAME} -Wl,--no-demangle @@ -852,7 +856,7 @@ when ($COMMON_LINK_SETTINGS == "yes") { when ($EMBED_LINKER_MAP == "yes") { LDFLAGS+=-Wl,-Map=${pre=$BINDIR/$MODULE_PREFIX;suf=.map.$_LINKER_ID:REALPRJNAME} - LINK_ADDITIONAL_SECTIONS+=--add-section=.ya.linker_map.${_LINKER_ID}=${pre=$BINDIR/$MODULE_PREFIX;suf=.map.$_LINKER_ID:REALPRJNAME} + _LINKER_MAP_SECTION=--add-section=.ya.linker_map.${_LINKER_ID}=${pre=$BINDIR/$MODULE_PREFIX;suf=.map.$_LINKER_ID:REALPRJNAME} } elsewhen ($DUMP_LINKER_MAP == "yes") { LDFLAGS+=-Wl,-Map=${rootrel;output;pre=$MODULE_PREFIX;suf=.map.$_LINKER_ID:REALPRJNAME} |