diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-08-07 08:12:19 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-08-07 08:22:05 +0300 |
| commit | 86696a40333309ebaa5205608466d1e4def42878 (patch) | |
| tree | 172e90a54a22970fce09d616535f1e6bf42c38e3 | |
| parent | e9b0eaca4af5c9b51f48af4f8a24b5483b1e1fde (diff) | |
| download | ydb-86696a40333309ebaa5205608466d1e4def42878.tar.gz | |
fix go_package_name
2a65a73857642ee364242333b3ebdbc907043d19
| -rw-r--r-- | build/conf/go.conf | 4 | ||||
| -rw-r--r-- | build/plugins/gobuild.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/build/conf/go.conf b/build/conf/go.conf index 93f1a65ac4..c75e3ec324 100644 --- a/build/conf/go.conf +++ b/build/conf/go.conf @@ -270,11 +270,11 @@ elsewhen ($CGO_ENABLED == "yes") { } # tag:go-specific -GO_PACKAGE_VALUE= +_GO_PACKAGE_VALUE= ### @usage: GO_PACKAGE_NAME(Name) ### Override name of a Go package. macro GO_PACKAGE_NAME(NAME) { - SET(GO_PACKAGE_VALUE $NAME) + SET(_GO_PACKAGE_VALUE $NAME) } # tag:go-specific tag:internal diff --git a/build/plugins/gobuild.py b/build/plugins/gobuild.py index 04603c2eb5..f5bb3ceaec 100644 --- a/build/plugins/gobuild.py +++ b/build/plugins/gobuild.py @@ -72,7 +72,9 @@ def compare_versions(version1, version2): def go_package_name(unit): - name = unit.get('GO_PACKAGE_VALUE') + name = unit.get('_GO_PACKAGE_VALUE') + if not name and unit.enabled('GO_TEST_MODULE'): + name = unit.get('GO_PACKAGE_VALUE') if not name: name = unit.get('GO_TEST_IMPORT_PATH') if name: |