diff --git a/Makefile b/Makefile index d6c9d2cd3..45f6c74a9 100644 --- a/Makefile +++ b/Makefile @@ -181,7 +181,7 @@ ios: app .PHONY: rtcrec rtcrec: - PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) CGO_LDFLAGS="$(NATIVE_CGO_LDFLAGS)" $(NATIVE_ENV) go build -o $(BUILDDIR)/rtcrec ./pkg/rtcrec/cmd/... + go build -o $(BUILDDIR)/rtcrec ./pkg/rtcrec/cmd/... # Go takes care of this automatically but we can speed up the build by downloading go deps while the build is running .PHONY: godeps diff --git a/hack/golangci-lint b/hack/golangci-lint index 0884b76f0..dc6856b13 100755 --- a/hack/golangci-lint +++ b/hack/golangci-lint @@ -15,7 +15,13 @@ OUT="$(mktemp)" ERR="$(mktemp)" trap 'rm -f "$OUT" "$ERR"' EXIT -podman exec golangci-lint golangci-lint "$@" "$OUT" 2>"$ERR" & +repo="$PWD" +builddir="${BUILDDIR:-build-linux-amd64}" +native="$repo/$builddir/rust/streamplace-native" +podman exec -w "$repo" \ + -e "CGO_LDFLAGS=-L$native -lmoq_ffi -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic" \ + -e "PKG_CONFIG_PATH=$repo/$builddir/meson-uninstalled:$repo/$builddir/lib/pkgconfig:$repo/$builddir/lib/gstreamer-1.0/pkgconfig" \ + golangci-lint bash "$repo/hack/native-go.sh" "$native" golangci-lint "$@" "$OUT" 2>"$ERR" & pid=$! seconds=0