diff options
| author | hiddenpath <hiddenpath@yandex-team.com> | 2024-04-02 23:50:23 +0300 |
|---|---|---|
| committer | hiddenpath <hiddenpath@yandex-team.com> | 2024-04-03 00:02:31 +0300 |
| commit | 8923c6d2c438e0aeed2e06b8b0275e1864eeee33 (patch) | |
| tree | 6b5e476699fc0be5091cb650654ef5f602c8afff /build/conf | |
| parent | d18afd09df2a08cd023012593b46109b77713a6c (diff) | |
| download | ydb-8923c6d2c438e0aeed2e06b8b0275e1864eeee33.tar.gz | |
Update golang to 1.22.1
2967d19c907adf59101a1f47b4208bd0b04a6186
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/go.conf | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/build/conf/go.conf b/build/conf/go.conf index f44a87ae9d..e497cb7b54 100644 --- a/build/conf/go.conf +++ b/build/conf/go.conf @@ -59,8 +59,11 @@ elsewhen ($ARCH_ARM64) { GO_HOST_TARG_PARAMS=++host-os $GO_HOST_OS ++host-arch $GO_HOST_ARCH ++targ-os $GO_TARG_OS ++targ-arch $GO_TARG_ARCH # tag:go-specific -GOSTD_VERSION=1.21 -when ($GOSTD_VERSION == "1.21") { +GOSTD_VERSION=1.22 +when ($GOSTD_VERSION == "1.22") { + GOSTD=contrib/go/_std_1.22/src +} +elsewhen ($GOSTD_VERSION == "1.21") { GOSTD=contrib/go/_std_1.21/src } otherwise { @@ -211,7 +214,7 @@ macro _GO_COMPILE_SYMABIS(FLAGS[], ASM_FILES...) { # tag:go-specific macro _GO_COMPILE_CGO1(NAME, FLAGS[], FILES...) { - .CMD=${hide:_CGO_FAKEID} ${cwd:ARCADIA_ROOT} $YMAKE_PYTHON ${input:"build/scripts/cgo1_wrapper.py"} $_GO_CGO1_WRAPPER_FLAGS --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT} --cgo1-files ${output;noext:FILES.cgo1.go} --cgo2-files ${output;noauto;noext:FILES.cgo2.c} -- ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -objdir $BINDIR -importpath $NAME $GO_CGO1_FLAGS_VALUE $FLAGS -- $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} ${CGO_CFLAGS_VALUE} ${input:FILES} ${output;hide:"_cgo_export.h"} ${output;hide:"_cgo_export.c"} ${output;hide:"_cgo_gotypes.go"} ${output;noauto;hide:"_cgo_main.c"} ${output;noauto;hide:"_cgo_flags"} $GO_TOOLCHAIN_ENV ${kv;hide:"p go"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} + .CMD=${hide:_CGO_FAKEID} ${cwd:ARCADIA_ROOT} $YMAKE_PYTHON ${input:"build/scripts/cgo1_wrapper.py"} $_GO_CGO1_WRAPPER_FLAGS --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT} --cgo1-files ${output;noext:FILES.cgo1.go} --cgo2-files ${output;noauto;noext:FILES.cgo2.c} -- ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -objdir $BINDIR -importpath $NAME $GO_CGO1_FLAGS_VALUE $FLAGS -- $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} ${CGO_CFLAGS_VALUE} ${input:FILES} ${output;hide:"_cgo_export.h"} ${output;hide:"_cgo_export.c"} ${output;hide:"_cgo_gotypes.go"} ${output;noauto;hide:"_cgo_main.c"} $GO_TOOLCHAIN_ENV ${kv;hide:"p go"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"} } # tag:go-specific @@ -856,6 +859,10 @@ module GO_PROGRAM: _GO_BASE_UNIT { PEERDIR(${GOSTD}/runtime library/go/core/buildinfo) + when ($CGO_ENABLED == "yes") { + PEERDIR += ${GOSTD}/runtime/cgo + } + when ($RACE == "yes") { PEERDIR += ${GOSTD}/runtime/cgo PEERDIR += ${GOSTD}/runtime/race |