@@ -163,12 +163,12 @@
 		# XXX:TODO: This needs to handle shell-quoted arguments
 		upvar #0 $handle state
 		set cmdStr [regsub -all {   *} $cmdStr { }]
 		set work [split $cmdStr " "]
 
-		foreach arg $work {
-			switch -glob -- $arg {
+		foreach cmd $work {
+			switch -glob -- $cmd {
 				"-I*" {
 					set dir [string range $cmd 2 end]
 					_add_include_path $handle $dir
 				}
 				"-D*" {