aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspreis <spreis@yandex-team.com>2024-08-15 09:41:56 +0300
committerspreis <spreis@yandex-team.com>2024-08-15 09:56:48 +0300
commit6d6f1645632e3d0b7a2a2f0e4d3c685dec62d407 (patch)
tree40830c3dc4d4c49f98b9931c08b8f54e32193f35
parent5fcd49974a967d31fef1fea125d97975454595bf (diff)
downloadydb-6d6f1645632e3d0b7a2a2f0e4d3c685dec62d407.tar.gz
Move base macroses back to ymake.core.conf - these are not settings
146de6d7a3ab889737001e8501cbfb1b4de2913f
-rw-r--r--build/conf/settings.conf5
-rw-r--r--build/ymake.core.conf6
2 files changed, 6 insertions, 5 deletions
diff --git a/build/conf/settings.conf b/build/conf/settings.conf
index defa0568ea..806bb3a9ac 100644
--- a/build/conf/settings.conf
+++ b/build/conf/settings.conf
@@ -129,8 +129,3 @@ _FOLDABLE_VARS=\
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 3c8ce2ce7b..d66d12801a 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -47,6 +47,12 @@ FALSE=no
MODULE_PREFIX=
MODULE_SUFFIX=
+__COMMA__=${comma:""}
+__BSDQ__=\"
+when ($STRUCT_CMD == "yes") {
+ __BSDQ__=\\\"
+}
+
# do not keep it undefined, since we directly subsitute it in LLVM_COMPILE_CXX etc.
WINDOWS=no