diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 2129490..de1fb8f 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -41,5 +41,9 @@
 
 BUCK=$ROOT_DIR/bin/buck
 
+if [ "${ONOS_NO_BUCKD:-1}" == "1" ]; then
+  export NO_BUCKD=1
+fi
+
 # Finally, run the Buck command...
-NO_BUCKD=1 $BUCK "$@"
+$BUCK "$@"