Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision cf48a146accf290d37d8e7202c30e8b5c1d320f9)
+++ driver/cfa.cc	(revision 0aa20e318f1669fc4920a51333207f5c43329e58)
@@ -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" ) {
Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision cf48a146accf290d37d8e7202c30e8b5c1d320f9)
+++ libcfa/src/Makefile.am	(revision 0aa20e318f1669fc4920a51333207f5c43329e58)
@@ -100,9 +100,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision cf48a146accf290d37d8e7202c30e8b5c1d320f9)
+++ libcfa/src/Makefile.in	(revision 0aa20e318f1669fc4920a51333207f5c43329e58)
@@ -984,9 +984,9 @@
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
-	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+	${AM_V_GEN}$(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @CFACPP@
 	${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
-	$(CFACOMPILE) -quiet -XCFA -l ${<} -c -o ${@}
+	$(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
 #----------------------------------------------------------------------------------------------------------------