Only have one coredata object because two is just wasteful.

1 files changed, 7 insertions, 7 deletions

diff --git a/backends.py b/backends.py
index 1c8844b..d94d8ea 100755
--- a/backends.py
+++ b/backends.py
@@ -126,13 +126,13 @@ class Backend():
         commands = []
         commands += self.build.get_global_flags(compiler)
         commands += target.get_extra_args(compiler.get_language())
-        if self.environment.new_coredata.buildtype != 'plain':
+        if self.environment.coredata.buildtype != 'plain':
             commands += compiler.get_debug_flags()
-        if self.environment.new_coredata.buildtype == 'optimized':
+            commands += compiler.get_std_warn_flags()
+        if self.environment.coredata.buildtype == 'optimized':
             commands += compiler.get_std_opt_flags()
-        if self.environment.new_coredata.coverage:
+        if self.environment.coredata.coverage:
             commands += compiler.get_coverage_flags()
-        commands += compiler.get_std_warn_flags()
         if isinstance(target, interpreter.SharedLibrary):
             commands += compiler.get_pic_flags()
         for dep in target.get_external_deps():
@@ -243,7 +243,7 @@ class NinjaBackend(Backend):
         self.generate_tests(outfile)
         outfile.write('# Install rules\n\n')
         self.generate_install(outfile)
-        if self.environment.new_coredata.coverage:
+        if self.environment.coredata.coverage:
             outfile.write('# Coverage rules\n\n')
             self.generate_coverage_rules(outfile)
         outfile.write('# Suffix\n\n')
@@ -301,7 +301,7 @@ class NinjaBackend(Backend):
         libdir = self.environment.get_libdir()
         bindir = self.environment.get_bindir()
 
-        should_strip = self.environment.new_coredata.strip
+        should_strip = self.environment.coredata.strip
         for t in self.build.get_targets().values():
             if t.should_install():
                 if isinstance(t, interpreter.Executable):
@@ -521,7 +521,7 @@ class NinjaBackend(Backend):
             commands += dep.get_link_flags()
         dependencies = target.get_dependencies()
         commands += self.build_target_link_arguments(dependencies)
-        if self.environment.new_coredata.coverage:
+        if self.environment.coredata.coverage:
             commands += linker.get_coverage_link_flags()
         dep_targets = [self.get_target_filename(t) for t in dependencies]
         elem = NinjaBuildElement(outname, linker_rule, obj_list)