diff options
Diffstat (limited to 'rtems-ra.cpp')
| -rw-r--r-- | rtems-ra.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rtems-ra.cpp b/rtems-ra.cpp index 8d1830c..7b7a98b 100644 --- a/rtems-ra.cpp +++ b/rtems-ra.cpp @@ -167,7 +167,6 @@ main (int argc, char* argv[]) std::string output_path = "./"; std::string output = "a.ra"; bool standard_libs = true; - bool exec_prefix_set = false; bool convert = true; rld::files::object_list dependents; @@ -241,18 +240,19 @@ main (int argc, char* argv[]) break; case 'C': - if (exec_prefix_set == true) + if (rld::cc::is_exec_prefix_set ()) std::cerr << "warning: exec-prefix ignored when CC provided" << std::endl; - rld::cc::cc = optarg; + rld::cc::set_cc (optarg); break; case 'E': - exec_prefix_set = true; - rld::cc::exec_prefix = optarg; + if (rld::cc::is_cc_set ()) + std::cerr << "warning: exec-prefix ignored when CC provided" << std::endl; + rld::cc::set_exec_prefix (optarg); break; case 'c': - rld::cc::cflags = optarg; + rld::cc::set_flags (optarg, rld::cc::ft_cflags); break; case 'S': @@ -296,8 +296,8 @@ main (int argc, char* argv[]) * types. This must be after we have added the object files because they * are used when detecting. */ - if (rld::cc::cc.empty () && !exec_prefix_set) - rld::cc::exec_prefix = rld::elf::machine_type (); + if (!rld::cc::is_cc_set () && !rld::cc::is_exec_prefix_set ()) + rld::cc::set_exec_prefix (rld::elf::machine_type ()); if (convert) { |