[rtems-tools commit] linkers: Merge the standard libraries into the user library paths.

[Chris Johns]

Module:    rtems-tools
Branch:    master
Commit:    53e387d9a48c7ee41288615dcff96548bced001c
Changeset: http://git.rtems.org/rtems-tools/commit/?id=53e387d9a48c7ee41288615dcff96548bced001c

Author:    Chris Johns <chrisj at rtems.org>
Date:      Tue Nov  4 19:39:57 2014 +1100

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

The change to rld::split clears the user's library paths. Fix
this.

---

 linkers/rtems-syms.cpp     |    3 +--
 rtemstoolkit/rld-cc.cpp    |    7 +++++--
 rtemstoolkit/rld-files.cpp |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/linkers/rtems-syms.cpp b/linkers/rtems-syms.cpp
index b5dd3f3..24cc56d 100644
--- a/linkers/rtems-syms.cpp
+++ b/linkers/rtems-syms.cpp
@@ -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' },
diff --git a/rtemstoolkit/rld-cc.cpp b/rtemstoolkit/rld-cc.cpp
index a2b1be4..1662a96 100644
--- a/rtemstoolkit/rld-cc.cpp
+++ b/rtemstoolkit/rld-cc.cpp
@@ -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
diff --git a/rtemstoolkit/rld-files.cpp b/rtemstoolkit/rld-files.cpp
index 995b059..201f604 100644
--- a/rtemstoolkit/rld-files.cpp
+++ b/rtemstoolkit/rld-files.cpp
@@ -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)
       {