From 17ce085244e09726726ed5cab342f69910024143740d51c8086b1752c2746407 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 25 Jun 2025 15:09:03 +0300 Subject: [PATCH] Make mk-bin aware of vendorized builds --- go/cm/utils/mk-bin | 4 ++-- go/utils/mk-bin | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go/cm/utils/mk-bin b/go/cm/utils/mk-bin index 027a422..52b34dd 100755 --- a/go/cm/utils/mk-bin +++ b/go/cm/utils/mk-bin @@ -8,7 +8,7 @@ GO_LDFLAGS="${GO_LDFLAGS:--s}" root="$(dirname "$(realpath -- "$0")")" cd "$root/.." -redo-ifchange \ +[ -d vendor ] && mod_vendor="-mod=vendor" || redo-ifchange \ enc/encrypted.schema.keks \ hash/prehash.schema.keks \ sign/pub.schema.keks \ @@ -16,5 +16,5 @@ redo-ifchange \ mkdir -p bin for cmd in enc hsh key sig ; do cmd=cm${cmd}tool - go build -o bin/$cmd -ldflags "$GO_LDFLAGS" ./cmd/$cmd + go build $mod_vendor -o bin/$cmd -ldflags "$GO_LDFLAGS" ./cmd/$cmd done diff --git a/go/utils/mk-bin b/go/utils/mk-bin index 0848ee2..4db0d33 100755 --- a/go/utils/mk-bin +++ b/go/utils/mk-bin @@ -10,6 +10,7 @@ root="$(dirname "$(realpath -- "$0")")" cd "$root/.." mkdir -p bin bin=$(realpath bin) -go build -o $bin/keks-schema-validate -ldflags "$GO_LDFLAGS" ./cmd/schema-validate +[ -d vendor ] && mod_vendor="-mod=vendor" +go build $mod_vendor -o $bin/keks-schema-validate -ldflags "$GO_LDFLAGS" ./cmd/schema-validate cd cmd/pp -go build -o $bin/kekspp -ldflags "$GO_LDFLAGS" +go build $mod_vendor -o $bin/kekspp -ldflags "$GO_LDFLAGS" -- 2.51.0