Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 34a6b2e659212c174177b49d4c952d1b2fe26cf0)
+++ driver/cfa.cc	(revision 1f690b3ef513f4620e8adff0756c4e5f3c028c4f)
@@ -403,5 +403,7 @@
 
 		// include the cfa library in case it's needed
-		args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src" : "")) ).c_str();
+		args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+		nargs += 1;
+		args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
 		nargs += 1;
 		args[nargs] = "-lcfa";