Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 13a984c6e9ba80e71a8c43f02a81da9e4c332f1e)
+++ driver/cfa.cc	(revision 3aeee3c077573b2b94c87d49a1ce778a008f2bc4)
@@ -405,5 +405,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";