Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 0163d3e684ab2ac8c4b162e8ed8511a6fa7c9dea)
+++ driver/cfa.cc	(revision 527acfcbdd2e4856c0e36daf93b4dff8066f520b)
@@ -185,10 +185,20 @@
 				args[nargs++] = argv[i];				// pass argument along
 				if ( arg == "-o" ) o_file = i;			// remember file
-			} else if ( arg == "-XCFA" ) {				// CFA pass through
-				i += 1;
-				if ( i == argc ) continue;				// next argument available ?
-				Putenv( argv, argv[i] );
-
-				// CFA specific arguments
+			} else if ( strncmp(arg.c_str(), "-XCFA", 5) == 0 ) {				// CFA pass through
+				if(arg.size() == 5) {
+					i += 1;
+					if ( i == argc ) continue;				// next argument available ?
+					Putenv( argv, argv[i] );
+
+					// CFA specific arguments
+				}
+				else if(arg[5] == ',') {
+					Putenv( argv, argv[i] + 6 );
+					printf("%s\n", argv[i] + 6 );
+					// CFA specific arguments
+				}
+				else {
+					args[nargs++] = argv[i];
+				}
 
 			} else if ( arg == "-CFA" ) {