rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-10-16 18:31:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

linkers: Merge the standard libraries into the user library paths.

Browse Source 
The change to rld::split clears the user's library paths. Fix
this.
This commit is contained in:
Chris Johns
2014-11-04 19:39:57 +11:00
parent ddbab71497
commit 53e387d9a4
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
linkers/rtems-syms.cpp
View File

@@ -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 * RTEMS Symbols options.
* single '-' and long options is present.
*/ */
static struct option rld_opts[] = { static struct option rld_opts[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },

7
rtemstoolkit/rld-cc.cpp
View File

@@ -285,7 +285,8 @@ namespace rld
return exec_prefix; return exec_prefix;
} }
bool is_exec_prefix_set () bool
is_exec_prefix_set ()
{ {
return !exec_prefix.empty (); return !exec_prefix.empty ();
} }
@@ -574,7 +575,9 @@ namespace rld
get_standard_libpaths (rld::path::paths& libpaths) get_standard_libpaths (rld::path::paths& libpaths)
{ {
search_dirs (); 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 void

2
rtemstoolkit/rld-files.cpp
View File

@@ -1575,7 +1575,7 @@ namespace rld
path::paths& libs) path::paths& libs)
{ {
if (rld::verbose () >= RLD_VERBOSE_INFO) if (rld::verbose () >= RLD_VERBOSE_INFO)
std::cout << "Finding libraries:." << std::endl; std::cout << "Finding libraries:" << std::endl;
libraries.clear (); libraries.clear ();
for (path::paths::size_type l = 0; l < libs.size (); ++l) for (path::paths::size_type l = 0; l < libs.size (); ++l)
{ {