diff options
| author | tekireeva <tekireeva@yandex-team.com> | 2023-11-27 11:07:15 +0300 |
|---|---|---|
| committer | tekireeva <tekireeva@yandex-team.com> | 2023-11-27 11:47:23 +0300 |
| commit | 8ff120094ddf6980a0ebd047056c133ce1c71130 (patch) | |
| tree | 04f5372afc46d4e7a401d272ee46cec1eacd75a3 /build/conf | |
| parent | 2d217ef4d8a69dfb8bdf34986b724c585e8655db (diff) | |
| download | ydb-8ff120094ddf6980a0ebd047056c133ce1c71130.tar.gz | |
Add Python implementation of EXTRALIBS
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/go.conf | 6 | ||||
| -rw-r--r-- | build/conf/linkers/ld.conf | 1 | ||||
| -rw-r--r-- | build/conf/swig.conf | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/build/conf/go.conf b/build/conf/go.conf index 0093d469ca..f138fc0fe6 100644 --- a/build/conf/go.conf +++ b/build/conf/go.conf @@ -642,7 +642,7 @@ module _GO_BASE_UNIT: _BASE_UNIT { .EXTS=.go .gosrc .o .obj .a .symabis .mf .CMD=TOUCH_UNIT .NODE_TYPE=Bundle - .GLOBAL=GO_LDFLAGS + .GLOBAL=GO_LDFLAGS OBJADDE_LIB .PEERDIR_POLICY=as_build_from .ALIASES=SRCS=_GO_SRCS RESOURCE=_GO_RESOURCE GO_TEST_SRCS=_GO_UNUSED_SRCS GO_XTEST_SRCS=_GO_UNUSED_SRCS GRPC=_GO_GRPC GO_GRPC_GATEWAY_SRCS=_GO_GRPC_GATEWAY_SRCS GO_GRPC_GATEWAY_SWAGGER_SRCS=_GO_GRPC_GATEWAY_SWAGGER_SRCS CFLAGS=CGO_CFLAGS GO_TEST_EMBED_PATTERN=_GO_UNUSED_SRCS GO_XTEST_EMBED_PATTERN=_GO_UNUSED_SRCS GO_TEST_EMBED_DIR=_GO_UNUSED_SRCS GO_XTEST_EMBED_DIR=_GO_UNUSED_SRCS GO_TEST_EMBED_BINDIR=_GO_UNUSED_SRCS GO_XTEST_EMBED_BINDIR=_GO_UNUSED_SRCS GO_GRPC_GATEWAY_V2_SRCS=_GO_GRPC_GATEWAY_V2_SRCS GO_GRPC_GATEWAY_V2_OPENAPI_SRCS=_GO_GRPC_GATEWAY_V2_OPENAPI_SRCS .ALLOWED=GO_PROTO_PLUGIN USE_CXX USE_UTIL RESOURCE_FILES @@ -770,11 +770,11 @@ module _GO_BASE_UNIT: _BASE_UNIT { when ($OS_DARWIN) { PEERDIR+=build/external_resources/go_fake_xcrun - GO_EXTLD = ++extld $_GO_EXTLD ++extldflags $_GO_SONAME $LD_SDK_VERSION -undefined dynamic_lookup $C_FLAGS_PLATFORM --sysroot=$MACOS_SDK_RESOURCE_GLOBAL --start-wa ${rootrel;ext=.a:SRCS_GLOBAL} --end-wa ${rootrel;ext=.o:SRCS_GLOBAL} --cgo-peers $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE $OBJADDE_LIB $GO_LDFLAGS_GLOBAL $C_LIBRARY_PATH $C_SYSTEM_LIBRARIES_INTERCEPT $C_SYSTEM_LIBRARIES $STRIP_FLAG + GO_EXTLD = ++extld $_GO_EXTLD ++extldflags $_GO_SONAME $LD_SDK_VERSION -undefined dynamic_lookup $C_FLAGS_PLATFORM --sysroot=$MACOS_SDK_RESOURCE_GLOBAL --start-wa ${rootrel;ext=.a:SRCS_GLOBAL} --end-wa ${rootrel;ext=.o:SRCS_GLOBAL} --cgo-peers $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $GO_LDFLAGS_GLOBAL $C_LIBRARY_PATH $C_SYSTEM_LIBRARIES_INTERCEPT $C_SYSTEM_LIBRARIES $STRIP_FLAG CGO2_LDFLAGS_VALUE += $LD_SDK_VERSION -undefined dynamic_lookup -nodefaultlibs -lc } elsewhen ($OS_LINUX) { - GO_EXTLD = ++extld $_GO_EXTLD ++extldflags $_GO_SONAME $C_FLAGS_PLATFORM --sysroot=$OS_SDK_ROOT_RESOURCE_GLOBAL -Wl,--whole-archive ${rootrel;ext=.a:SRCS_GLOBAL} -Wl,--no-whole-archive ${rootrel;ext=.o:SRCS_GLOBAL} --cgo-peers $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE $OBJADDE_LIB $GO_LDFLAGS_GLOBAL $C_LIBRARY_PATH $C_SYSTEM_LIBRARIES_INTERCEPT $C_SYSTEM_LIBRARIES $STRIP_FLAG + GO_EXTLD = ++extld $_GO_EXTLD ++extldflags $_GO_SONAME $C_FLAGS_PLATFORM --sysroot=$OS_SDK_ROOT_RESOURCE_GLOBAL -Wl,--whole-archive ${rootrel;ext=.a:SRCS_GLOBAL} -Wl,--no-whole-archive ${rootrel;ext=.o:SRCS_GLOBAL} --cgo-peers $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $GO_LDFLAGS_GLOBAL $C_LIBRARY_PATH $C_SYSTEM_LIBRARIES_INTERCEPT $C_SYSTEM_LIBRARIES $STRIP_FLAG CGO2_LDFLAGS_VALUE += -Wl,--unresolved-symbols=ignore-all -nodefaultlibs -lc } otherwise { diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index 96083eb6b8..f6c9cdc0e0 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -152,6 +152,7 @@ _EXE_FLAGS=\ $LDFLAGS_GLOBAL \ $OBJADDE \ $OBJADDE_LIB \ + $OBJADDE_LIB_GLOBAL \ $C_LIBRARY_PATH \ $C_SYSTEM_LIBRARIES_INTERCEPT \ $C_SYSTEM_LIBRARIES \ diff --git a/build/conf/swig.conf b/build/conf/swig.conf index 2bfbbf0a7c..27819f10a8 100644 --- a/build/conf/swig.conf +++ b/build/conf/swig.conf @@ -69,7 +69,7 @@ SWIG_JNI_BINDINGS_SEM= \ target_include_directories PUBLIC $_C__INCLUDE_GLOBAL && \ target_include_directories PRIVATE $_C__INCLUDE_OWNED && \ target_compile_options PRIVATE $USER_CFLAGS $USER_CXXFLAGS $_SEM_EXTRA_CXX_FLAGS && target_compile_options PUBLIC $USER_CFLAGS_GLOBAL_RAW $USER_CXXFLAGS_GLOBAL_RAW && \ - target_link_options PRIVATE $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE && \ + target_link_options PRIVATE $LDFLAGS_GLOBAL_RAW $LDFLAGS $OBJADDE_LIB $OBJADDE_LIB_GLOBAL $OBJADDE && \ add_jar ${REALPRJNAME} SOURCES $_EXPLICIT_SWIG_JAVA_SOURCES @${"$"}{CMAKE_CURRENT_BINARY_DIR}/swig_gen_java.lst ${hide:TARGET} ### @usage: DLL_JAVA() |