aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2024-10-09 07:43:49 +0300
committersnermolaev <snermolaev@yandex-team.com>2024-10-09 07:55:51 +0300
commit57c2c368e8792f5de7393cf35fe5afcc766b0607 (patch)
tree6853c8be797b78171c4213b5cf6db14c5e87dc8c
parent44c730d2c72b3db3836bc51c16fd65a59fee7995 (diff)
downloadydb-57c2c368e8792f5de7393cf35fe5afcc766b0607.tar.gz
move initialization of LDFLAGS, LDFLAGS_GLOBAL and OBJADDE to ymake.core.conf
commit_hash:c64980cadd842dd72655837696a15932277e74bc
-rw-r--r--build/conf/linkers/ld.conf3
-rw-r--r--build/conf/linkers/msvc_linker.conf6
-rw-r--r--build/ymake.core.conf3
3 files changed, 3 insertions, 9 deletions
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index bab91a3ea3..d7c63cf4df 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -1,5 +1,4 @@
LDFLAGS+=$USER_LDFLAGS $_LD_FLAGS
-LDFLAGS_GLOBAL+=
_START_GROUP=
_END_GROUP=
@@ -115,8 +114,6 @@ when ($OS_EMSCRIPTEN == "yes") {
}
C_SYSTEM_LIBRARIES=$_C_SYSTEM_LIBRARIES
-OBJADDE=
-
LD_EXPORT_ALL_DYNAMIC_SYMBOLS_FLAG=
when ($OS_LINUX == "yes" || $OS_ANDROID == "yes") {
LD_EXPORT_ALL_DYNAMIC_SYMBOLS_FLAG=-rdynamic
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf
index 7bba3060ad..d235608bca 100644
--- a/build/conf/linkers/msvc_linker.conf
+++ b/build/conf/linkers/msvc_linker.conf
@@ -99,12 +99,6 @@ LINK_STDLIBS=\
winspool.lib \
ws2_32.lib
-LDFLAGS_GLOBAL=
-LDFLAGS=
-OBJADDE=
-OBJADDE_LIB=
-OBJADDE_LIB_GLOBAL=
-
LINK_EXE_FLAGS=$LINK_EXE_FLAGS_PER_TYPE
LINK_EXE_VFS_FLAGS=
when ($_UNDER_WINE_LINK != "yes" && $USE_MSVC_LINKER != "yes") {
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 2661bd5bac..6414f90d1e 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -40,6 +40,9 @@ SFLAGS=
SRCFLAGS=
FORCE_COVERAGE_ENABLED=
FORCE_COVERAGE_DISABLED=
+LDFLAGS=
+LDFLAGS_GLOBAL=
+OBJADDE=
OBJADDE_LIB=
OBJADDE_LIB_GLOBAL=
TRUE=yes