diff --git a/setup_board b/setup_board
index a524edfc2f..38b2765ea1 100755
--- a/setup_board
+++ b/setup_board
@@ -249,10 +249,10 @@ build_toolchain() {
   fi
   if [ $FLAGS_latest_toolchain -ne $FLAGS_TRUE ]; then
     CROSS_ARGS+=(
-      --binutils $FLAGS_binutils_version
-      --gcc $FLAGS_gcc_version
-      --kernel $FLAGS_kernel_version
-      --libc $FLAGS_libc_version
+      --binutils "${FLAGS_binutils_version}"
+      --gcc "${FLAGS_gcc_version}"
+      --kernel "${FLAGS_kernel_version}"
+      --libc "${FLAGS_libc_version}"
     )
   fi
   CROSS_ARGS+=(