diff options
| author | AlexSm <alex@ydb.tech> | 2023-12-27 23:31:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-27 23:31:58 +0100 |
| commit | d67bfb4b4b7549081543e87a31bc6cb5c46ac973 (patch) | |
| tree | 8674f2f1570877cb653e7ddcff37ba00288de15a /build/ymake.core.conf | |
| parent | 1f6bef05ed441c3aa2d565ac792b26cded704ac7 (diff) | |
| download | ydb-d67bfb4b4b7549081543e87a31bc6cb5c46ac973.tar.gz | |
Import libs 4 (#758)
Diffstat (limited to 'build/ymake.core.conf')
| -rw-r--r-- | build/ymake.core.conf | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 3a236876bc..c1314fc8e9 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -9,7 +9,7 @@ FAKEID=628318530716 SANDBOX_FAKEID=${FAKEID}.7600000 -CPP_FAKEID=2023-12-05 +CPP_FAKEID=2023-12-06 GO_FAKEID=11100371 ANDROID_FAKEID=2023-05-17 CLANG_TIDY_FAKEID=2023-06-06 @@ -50,6 +50,11 @@ when ($CLANG16 == "yes") { CLANG_VER=16 } +USE_ARCADIA_COMPILER_RUNTIME=yes + +when ($LOCAL && $XCODE) { + USE_ARCADIA_COMPILER_RUNTIME=no +} @import "${CONF_ROOT}/conf/settings.conf" @import "${CONF_ROOT}/conf/opensource.conf" @@ -236,7 +241,7 @@ EXTRA_OUTPUT= when ($CLANG == "yes" || $GCC == "yes") { when ($BUILD_TYPE == "COVERAGE" || $GCOV_COVERAGE) { COVERAGE_FLAGS=-fprofile-arcs -ftest-coverage - EXTRA_OUTPUT=${output;noauto;hide;suf=${COMPILE_OUT_SUFFIX}${_CROSS_SUFFIX}.gcno:SRC} + EXTRA_OUTPUT=${output;noauto;hide;suf=${COMPILE_OUT_SUFFIX}${OBJ_SUF}${_CROSS_SUFFIX}.gcno:SRC} } } @@ -294,7 +299,9 @@ otherwise { # line when `ya make ...` is invoked. when ($NORUNTIME != "yes") { SYSINCL+=build/sysincl/stl-to-libcxx.yml - SYSINCL+=build/sysincl/stl-to-libcxxmsvc.yml + when ($MSVC == "yes" && $CLANG_CL != "yes") { + SYSINCL+=build/sysincl/stl-to-libcxxmsvc.yml + } when ($MUSL == "yes") { SYSINCL+=build/sysincl/libc-musl-libcxx.yml } @@ -774,6 +781,8 @@ module _BASE_UNIT: _BARE_UNIT { when ($TIDY_ENABLED == "yes") { PEERDIR+=build/platform/clang/clang-tidy } + + ENABLE(USE_YASM_ASSEMBLER) } _LINKER_ID= @@ -2393,6 +2402,12 @@ module UNION: _BASE_UNIT { } # tag:internal +### @usage: _ADD_HIDDEN_INPUTS(inputs...) # internal +macro _ADD_HIDDEN_INPUTS(Inputs...) { + .CMD=${input;hide:Inputs} +} + +# tag:internal ### @usage: _SET_FIRST_VALUE(name args...) # internal ### ### This macro sets the value of `name` variable to the value of next argument @@ -4795,9 +4810,12 @@ macro _SRC_nasm(SRC, PREINCLUDES[], SRCFLAGS...) { when ($USE_NASM_ASSEMBLER == "yes") { _SRC_ASM_CMDLINE=$_SRC_nasm($SRC $SRCFLAGS) } -otherwise { +elsewhen ($USE_YASM_ASSEMBLER == "yes") { _SRC_ASM_CMDLINE=$_SRC_yasm($SRC $SRCFLAGS) } +otherwise { + _SRC_ASM_CMDLINE= +} # tag:src-processing macro _SRC_ASM(SRC, SRCFLAGS...) { |