diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index 09ec728cd..65d56d3ae 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -470,9 +470,12 @@ class CommandLineTools {
 			
 		}
 		
+		
 		for (arg in args) {
 			
-			if (arg == "-nocffi") {
+			// TODO: Allow -rebuild without locking native binary?
+			
+			if (arg == "-nocffi" || arg == "-rebuild") {
 				
 				CFFI.enabled = false;