diff --git a/build-support/functions/20-build.sh b/build-support/functions/20-build.sh
index 1b0ca0999c..54a6dd4235 100644
--- a/build-support/functions/20-build.sh
+++ b/build-support/functions/20-build.sh
@@ -460,7 +460,7 @@ function build_consul_local {
             
             mkdir -p "${outdir}"
             GOBIN_EXTRA=""
-            if test "${os}" != "$(go env GOOS)" -o "${arch}" != "$(go env GOARCH)"
+            if test "${os}" != "$(go env GOHOSTOS)" -o "${arch}" != "$(go env GOHOSTARCH)"
             then
                GOBIN_EXTRA="${os}_${arch}/"
             fi