From 61611222588d1cd9c66c035a6b6dd61857d34653 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 22 Oct 2007 18:04:43 +0000 Subject: [PATCH] Implement -Bstatic/-Bdynamic. --- gold/fileread.cc | 3 ++- gold/options.cc | 8 ++++++++ gold/options.h | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gold/fileread.cc b/gold/fileread.cc index c4145de5cdb..1e3b4638f68 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -428,7 +428,8 @@ 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()) + if (options.is_static() + || this->input_argument_->options().do_static_search()) n1 += ".a"; else { diff --git a/gold/options.cc b/gold/options.cc index 9513f15188d..4e74dcefa8a 100644 --- a/gold/options.cc +++ b/gold/options.cc @@ -312,6 +312,14 @@ options::Command_line_options::options[] = POSDEP_NOARG('\0', "no-as-needed", N_("Always DT_NEEDED for dynamic libs (default)"), NULL, TWO_DASHES, &Position_dependent_options::clear_as_needed), + POSDEP_NOARG('\0', "Bdynamic", + N_("-l searches for shared libraries"), + NULL, ONE_DASH, + &Position_dependent_options::set_dynamic_search), + POSDEP_NOARG('\0', "Bstatic", + N_("-l does not search for shared libraries"), + NULL, ONE_DASH, + &Position_dependent_options::set_static_search), GENERAL_NOARG('\0', "Bsymbolic", N_("Bind defined symbols locally"), NULL, ONE_DASH, &General_options::set_symbolic), GENERAL_NOARG('E', "export-dynamic", N_("Export all dynamic symbols"), diff --git a/gold/options.h b/gold/options.h index 701aa9c6a04..f9782cc9991 100644 --- a/gold/options.h +++ b/gold/options.h @@ -397,8 +397,8 @@ class Position_dependent_options public: Position_dependent_options(); - // -Bstatic: Whether we are searching for a static archive rather - // than a shared object. + // -Bdynamic/-Bstatic: Whether we are searching for a static archive + // -rather than a shared object. bool do_static_search() const { return this->do_static_search_; } -- 2.30.2