From f6ce93d6e999d1a0c450c5e71c5b3468e6217f0a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 6 Nov 2006 22:46:08 +0000 Subject: Split Object into Dynobj and Relobj, incorporate elfcpp swapping changes. --- gold/fileread.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gold/fileread.cc') diff --git a/gold/fileread.cc b/gold/fileread.cc index 00971a7..43c69b3 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -314,9 +314,13 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) std::string n1("lib"); n1 += this->input_argument_.name(); std::string n2; - if (!options.is_static()) - n2 = n1 + ".so"; - n1 += ".a"; + if (options.is_static()) + n1 += ".a"; + else + { + n2 = n1 + ".a"; + n1 += ".so"; + } name = dirpath.find(n1, n2); if (name.empty()) { -- cgit v1.1