Changeset b7ad4a2 in rtems-tools for linkers/rtems-ld.cpp


Ignore:
Timestamp:
Sep 8, 2014, 10:40:13 PM (5 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, master
Children:
30a7f06
Parents:
6fb1409
Message:

linkers: If no RTEMS path is provied see if the prefix can be used.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • linkers/rtems-ld.cpp

    r6fb1409 rb7ad4a2  
    199199    bool                 one_file = false;
    200200
     201    rld::set_cmdline (argc, argv);
     202
    201203    libpaths.push_back (".");
    202204
     
    330332    }
    331333
     334    /*
     335     * Set the program name.
     336     */
     337    rld::set_progname (argv[0]);
     338
    332339    argc -= optind;
    333340    argv += optind;
    334341
    335342    if (rld::verbose () || map)
     343    {
    336344      std::cout << "RTEMS Linker " << rld::version () << std::endl;
     345      std::cout << " " << rld::get_cmdline () << std::endl;
     346    }
    337347
    338348    /*
     
    356366    if (!rtems_arch_bsp.empty ())
    357367    {
    358       if (rtems_path.empty ())
     368      const std::string& prefix = rld::get_prefix ();
     369      if (rtems_path.empty () && prefix.empty ())
    359370        throw rld::error ("No RTEMS path provide with arch/bsp", "options");
    360       rld::rtems::set_path (rtems_path);
     371      if (!rtems_path.empty ())
     372        rld::rtems::set_path (rtems_path);
     373      else
     374        rld::rtems::set_path (prefix);
    361375      rld::rtems::set_arch_bsp (rtems_arch_bsp);
    362376    }
Note: See TracChangeset for help on using the changeset viewer.