diff options
author | Chris Johns <chrisj@rtems.org> | 2014-09-06 20:19:45 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2014-09-06 20:19:45 +1000 |
commit | 0e448a4e8eff2f433f10309c8c832faa5adf4b94 (patch) | |
tree | 6a98a5b20ffd2bc8dc2d8ae0292c6b772234676b /rtems-syms.cpp | |
parent | 82775e9e7006f2a66d900f7a99699788bfd5cd18 (diff) |
Refactor the CC flags. Fix the various linkers. The trace linker is compiling.
Diffstat (limited to 'rtems-syms.cpp')
-rw-r--r-- | rtems-syms.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rtems-syms.cpp b/rtems-syms.cpp index 24c7826..031f46a 100644 --- a/rtems-syms.cpp +++ b/rtems-syms.cpp @@ -138,7 +138,6 @@ main (int argc, char* argv[]) std::string base_name; std::string cc_name; bool standard_libs = false; - bool exec_prefix_set = false; #if HAVE_WARNINGS bool warnings = false; #endif @@ -188,18 +187,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 '?': @@ -246,8 +246,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 ()); /* * Get the standard library paths |