Make mk-bin aware of vendorized builds

diff --git a/go/cm/utils/mk-bin b/go/cm/utils/mk-bin
index 027a42294b0ad444ae22491fbcc98daf4524303887bdad9de576b920ad60ed99..52b34dd455bf34146ae2143aa3e45753882e3f31010ae1fe821cc588b6213703 100755 (executable)
--- 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 0848ee255bf0ea0103b2246eadab0ce0be451e54adfe2786ee489081c27e94bd..4db0d33edf006fe01b959080ab16373429d3f31d5b59f8e73c273f0a0b53d6be 100755 (executable)
--- 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"