diff options
| author | Ian Lance Taylor <iant@google.com> | 2007-10-09 17:46:15 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2007-10-09 17:46:15 +0000 |
| commit | e2aacd2c759620f4d18142f811c916adcf6fb7b4 (patch) | |
| tree | 203f537bc4a09bc8d898e443eee5f68dacb2a38a /gold/fileread.cc | |
| parent | 7068dd5353f3c23c4d775922de72a25732579fb1 (diff) | |
| download | gdb-e2aacd2c759620f4d18142f811c916adcf6fb7b4.zip gdb-e2aacd2c759620f4d18142f811c916adcf6fb7b4.tar.gz gdb-e2aacd2c759620f4d18142f811c916adcf6fb7b4.tar.bz2 | |
Fix soname for library found in search path.
Diffstat (limited to 'gold/fileread.cc')
| -rw-r--r-- | gold/fileread.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gold/fileread.cc b/gold/fileread.cc index 1bbd841..88ac126 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -397,8 +397,10 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) if (IS_ABSOLUTE_PATH (this->input_argument_->name()) || (!this->input_argument_->is_lib() && this->input_argument_->extra_search_path() == NULL)) - name = this->input_argument_->name(); - + { + name = this->input_argument_->name(); + this->found_name_ = name; + } // Case 3: is_lib is true else if (this->input_argument_->is_lib()) { @@ -421,8 +423,11 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) this->input_argument_->name()); gold_exit(false); } + if (n2.empty() || name[name.length() - 1] == 'o') + this->found_name_ = n1; + else + this->found_name_ = n2; } - // Case 4: extra_search_path is not empty else { @@ -446,6 +451,7 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) gold_exit(false); } } + this->found_name_ = this->input_argument_->name(); } // Now that we've figured out where the file lives, try to open it. |