diff options
| author | spreis <spreis@yandex-team.ru> | 2022-04-26 18:16:27 +0300 |
|---|---|---|
| committer | spreis <spreis@yandex-team.ru> | 2022-04-26 18:16:27 +0300 |
| commit | fceb8891abb608f9dc4b914b4643eb208db4e545 (patch) | |
| tree | 66c683300a42917906703ae239ddbe9034a20335 | |
| parent | aa4d5ca8a58e0152eb4495140461f965aec71580 (diff) | |
| download | ydb-fceb8891abb608f9dc4b914b4643eb208db4e545.tar.gz | |
Apply COMPILE_OUT_SUFFIX to extra ouutput of yndexer
ref:ae96178c5bba510411e26bb0b9de7840ce48b202
| -rw-r--r-- | build/conf/compilers/gnu_compiler.conf | 2 | ||||
| -rw-r--r-- | build/ymake.core.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf index ceef782eb2..8bb05a134b 100644 --- a/build/conf/compilers/gnu_compiler.conf +++ b/build/conf/compilers/gnu_compiler.conf @@ -327,7 +327,7 @@ OBJECT_SUF=$OBJ_SUF$_CROSS_SUFFIX.o GCC_COMPILE_FLAGS=$EXTRA_C_FLAGS -c -o $_COMPILE_OUTPUTS ${pre=-I:_C__INCLUDE} EXTRA_COVERAGE_OUTPUT=${output;noauto;hide;suf=${OBJECT_SUF}.gcno:SRC} CLANG_TIDY_OUTPUT_FILE=${output;noauto;suf=${OBJECT_SUF}.tidyjson:SRC} -YNDEXER_OUTPUT_FILE=${output;noauto;suf=${OBJECT_SUF}.ydx.pb2:SRC} +YNDEXER_OUTPUT_FILE=${output;noauto;suf=${OBJECT_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC} when ($DUMP_COMPILER_DEPS == "yes") { DUMP_DEPS=-MD ${output;hide;noauto;suf=${OBJ_SUF}.o.d:SRC} diff --git a/build/ymake.core.conf b/build/ymake.core.conf index da729764ad..4688481b08 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -110,7 +110,7 @@ otherwise { when ($CODENAVIGATION && $NOCODENAVIGATION != "yes") { PY_PROGRAM_LINK_EXE=$LINK_EXE ${kv;hide:"pyndex $TARGET"} YNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_RESOURCE_GLOBAL/yndexer 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC} - YNDEXER_OUTPUT=${output;noauto;suf=${OBJ_CROSS_SUF}.ydx.pb2:SRC} + YNDEXER_OUTPUT=${output;noauto;suf=${OBJ_CROSS_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC} } otherwise { PY_PROGRAM_LINK_EXE=$LINK_EXE |