diff --git a/lib/Support/ToolRunner.cpp b/lib/Support/ToolRunner.cpp
index 654ce95bafa..cd385d62a7e 100644
--- a/lib/Support/ToolRunner.cpp
+++ b/lib/Support/ToolRunner.cpp
@@ -289,6 +289,7 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
   GCCArgs.push_back(OutputBinary.c_str()); // Output to the right file...
   GCCArgs.push_back("-lm");                // Hard-code the math library...
   GCCArgs.push_back("-O2");                // Optimize the program a bit...
+  GCCArgs.push_back("-Wl,-R.");            // Search this dir for .so files
   GCCArgs.push_back(0);                    // NULL terminator
 
   std::cout << "<gcc>" << std::flush;
diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp
index 654ce95bafa..cd385d62a7e 100644
--- a/tools/bugpoint/ToolRunner.cpp
+++ b/tools/bugpoint/ToolRunner.cpp
@@ -289,6 +289,7 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
   GCCArgs.push_back(OutputBinary.c_str()); // Output to the right file...
   GCCArgs.push_back("-lm");                // Hard-code the math library...
   GCCArgs.push_back("-O2");                // Optimize the program a bit...
+  GCCArgs.push_back("-Wl,-R.");            // Search this dir for .so files
   GCCArgs.push_back(0);                    // NULL terminator
 
   std::cout << "<gcc>" << std::flush;