Move base macroses back to ymake.core.conf - these are not settings

146de6d7a3ab889737001e8501cbfb1b4de2913f

Author: nemo-cpt

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__=\\\"
-}

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