From 3f3cddf146bb20f8222ce6ed8c8ffc6ee9c59124 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 3 Nov 2011 04:32:01 +0000 Subject: * configure.ac: Add --with-lib-path option. Define LIB_PATH and NATIVE_LINKER. * Makefile.am (AM_CPPFLAGS): Define TOOLLIBDIR. * options.cc (General_options::finalize): Use library search path from configure script if specified. If not native and no sysroot, only search TOOLLIBDIR. * options.h (Search_directory::Search_directory): Change name to const std::string&. (General_options::add_to_library_path_with_sysroot): Change arg to const std::string&. * configure, Makefile.in, config.in: Rebuild. --- gold/options.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gold/options.h') diff --git a/gold/options.h b/gold/options.h index 8876a1e..534df26 100644 --- a/gold/options.h +++ b/gold/options.h @@ -543,7 +543,7 @@ class Search_directory { } // This is the usual constructor. - Search_directory(const char* name, bool put_in_sysroot) + Search_directory(const std::string& name, bool put_in_sysroot) : name_(name), put_in_sysroot_(put_in_sysroot), is_in_sysroot_(false) { if (this->name_.empty()) @@ -1463,7 +1463,7 @@ class General_options // These are called by finalize() to set up the search-path correctly. void - add_to_library_path_with_sysroot(const char* arg) + add_to_library_path_with_sysroot(const std::string& arg) { this->add_search_directory_to_library_path(Search_directory(arg, true)); } // Apply any sysroot to the directory lists. -- cgit v1.1