diff --git a/scripts/build.sh b/scripts/build.sh
index 3422f8ec3..5ff399039 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -144,7 +144,7 @@ IFS="${OLDIFS}"
 
 # Copy our OS/Arch to the bin/ directory
 echo "==> Copying binaries for this platform..."
-DEV_PLATFORM="./pkg/${XC_OS}_${XC_ARCH}"
+DEV_PLATFORM="./pkg/$(go env GOOS)_$(go env GOARCH)"
 for F in $(find ${DEV_PLATFORM} -mindepth 1 -maxdepth 1 -type f); do
     cp -v ${F} bin/
     cp -v ${F} "${MAIN_GOPATH}/bin/"