diff options
| author | spreis <spreis@yandex-team.com> | 2024-08-14 10:36:52 +0300 |
|---|---|---|
| committer | spreis <spreis@yandex-team.com> | 2024-08-14 10:49:44 +0300 |
| commit | 0c4397eb7b46ea36fd3b12c5c640e7b4dd0c7093 (patch) | |
| tree | 7abfe4ccc383c3c45718acef48638f659169d7f2 | |
| parent | c396916a700a53920a2e76247779688320e270e3 (diff) | |
| download | ydb-0c4397eb7b46ea36fd3b12c5c640e7b4dd0c7093.tar.gz | |
Move some vars to settings.conf
de509a9a86b97b4bcfbd95d33c8f9205308ea957
| -rw-r--r-- | build/conf/settings.conf | 28 | ||||
| -rw-r--r-- | build/ymake.core.conf | 22 |
2 files changed, 26 insertions, 24 deletions
diff --git a/build/conf/settings.conf b/build/conf/settings.conf index 770d343ff8..563f0985a8 100644 --- a/build/conf/settings.conf +++ b/build/conf/settings.conf @@ -16,9 +16,23 @@ REPORT_ALL_DUPSRC=yes DEPS_CACHE_CONTROL_UIDS_CACHE=yes INCLUDE_BLACKLIST_TO_CONF_HASH=yes INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes +USE_GLOBAL_CMD=yes +YMAKE_USE_NEW_UIDS=yes +USE_GRAPH_CHANGES_PREDICTOR=yes +PIC_NO_PIE=no +FAIL_PY2=no -when ($YMAKE_USE_OLD_UIDS != "yes") { - YMAKE_USE_NEW_UIDS=yes +when ($YMAKE_USE_OLD_UIDS == "yes") { + YMAKE_USE_NEW_UIDS=no +} + +when ($OS_WINDOWS == "yes") { + USE_GLOBAL_CMD=no +} + +when ($AUTOCHECK == "yes") { + USE_GRAPH_CHANGES_PREDICTOR=no + PIC_NO_PIE=yes } # NOTE! Only foldable vars should be listed here @@ -111,3 +125,13 @@ _FOLDABLE_VARS=\ _STD_CXX_VERSION \ # end of _FOLDABLE_VARS list + +ARCADIA_TEST_ROOT=../arcadia_tests_data/ +DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32 + +__COMMA__=${comma:""} +__BSDQ__=\" +when ($STRUCT_CMD == "yes") { + __BSDQ__=\\\" +} + diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 01d2caab9b..3c8ce2ce7b 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -87,33 +87,11 @@ when ($LOCAL && $XCODE) { @import "${CONF_ROOT}/conf/project_specific/yt.conf" SO_OUTPUTS=no -USE_GLOBAL_CMD=no -when ($OS_WINDOWS != "yes") { - USE_GLOBAL_CMD=yes -} when ($USE_PYTHON) { C_DEFINES+= -DUSE_PYTHON } -__COMMA__=${comma:""} -__BSDQ__=\" -when ($STRUCT_CMD == "yes") { - __BSDQ__=\\\" -} - -# This shall be moved to settings.conf -USE_GRAPH_CHANGES_PREDICTOR=yes -when ($AUTOCHECK == "yes") { - USE_GRAPH_CHANGES_PREDICTOR=no - PIC_NO_PIE=yes -} - -ARCADIA_TEST_ROOT=../arcadia_tests_data/ -DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32 - -FAIL_PY2=no - _PREBUILT_TOOLS_ROOT=build/prebuilt _TOOL_PROTOC_GEN_GO=vendor/github.com/golang/protobuf/protoc-gen-go _TOOL_PROTOC_GEN_GO_V2=vendor/google.golang.org/protobuf/cmd/protoc-gen-go |