Changeset 53e387d in rtems-tools


Ignore:
Timestamp:
Nov 4, 2014, 8:39:57 AM (5 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, master
Children:
b9c0a04
Parents:
ddbab71
Message:

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

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • linkers/rtems-syms.cpp

    rddbab71 r53e387d  
    223223
    224224/**
    225  * RTEMS Linker options. This needs to be rewritten to be like cc where only a
    226  * single '-' and long options is present.
     225 * RTEMS Symbols options.
    227226 */
    228227static struct option rld_opts[] = {
  • rtemstoolkit/rld-cc.cpp

    rddbab71 r53e387d  
    286286    }
    287287
    288     bool is_exec_prefix_set ()
     288    bool
     289    is_exec_prefix_set ()
    289290    {
    290291      return !exec_prefix.empty ();
     
    575576    {
    576577      search_dirs ();
    577       rld::split (libpaths, libraries_path, RLD_PATHSTR_SEPARATOR);
     578      rld::path::paths stdlibpaths;
     579      rld::split (stdlibpaths, libraries_path, RLD_PATHSTR_SEPARATOR);
     580      libpaths.insert (libpaths.end (), stdlibpaths.begin (), stdlibpaths.end ());
    578581    }
    579582
  • rtemstoolkit/rld-files.cpp

    rddbab71 r53e387d  
    15761576    {
    15771577      if (rld::verbose () >= RLD_VERBOSE_INFO)
    1578         std::cout << "Finding libraries:." << std::endl;
     1578        std::cout << "Finding libraries:" << std::endl;
    15791579      libraries.clear ();
    15801580      for (path::paths::size_type l = 0; l < libs.size (); ++l)
Note: See TracChangeset for help on using the changeset viewer.