mirror of
https://git.rtems.org/rtems-tools/
synced 2025-10-16 18:31:18 +08:00
linkers: Merge the standard libraries into the user library paths.
The change to rld::split clears the user's library paths. Fix this.
This commit is contained in:
@@ -222,8 +222,7 @@ generate_symmap (rld::process::tempfile& c,
|
||||
}
|
||||
|
||||
/**
|
||||
* RTEMS Linker options. This needs to be rewritten to be like cc where only a
|
||||
* single '-' and long options is present.
|
||||
* RTEMS Symbols options.
|
||||
*/
|
||||
static struct option rld_opts[] = {
|
||||
{ "help", no_argument, NULL, 'h' },
|
||||
|
@@ -285,7 +285,8 @@ namespace rld
|
||||
return exec_prefix;
|
||||
}
|
||||
|
||||
bool is_exec_prefix_set ()
|
||||
bool
|
||||
is_exec_prefix_set ()
|
||||
{
|
||||
return !exec_prefix.empty ();
|
||||
}
|
||||
@@ -574,7 +575,9 @@ namespace rld
|
||||
get_standard_libpaths (rld::path::paths& libpaths)
|
||||
{
|
||||
search_dirs ();
|
||||
rld::split (libpaths, libraries_path, RLD_PATHSTR_SEPARATOR);
|
||||
rld::path::paths stdlibpaths;
|
||||
rld::split (stdlibpaths, libraries_path, RLD_PATHSTR_SEPARATOR);
|
||||
libpaths.insert (libpaths.end (), stdlibpaths.begin (), stdlibpaths.end ());
|
||||
}
|
||||
|
||||
void
|
||||
|
@@ -1575,7 +1575,7 @@ namespace rld
|
||||
path::paths& libs)
|
||||
{
|
||||
if (rld::verbose () >= RLD_VERBOSE_INFO)
|
||||
std::cout << "Finding libraries:." << std::endl;
|
||||
std::cout << "Finding libraries:" << std::endl;
|
||||
libraries.clear ();
|
||||
for (path::paths::size_type l = 0; l < libs.size (); ++l)
|
||||
{
|
||||
|
Reference in New Issue
Block a user