Commit ccb729a9 authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

cerbero: Set buildtype flags in the right place

These should be set after we've added the toolchain flags from the
platform config. Otherwise they will get unset when we call
`set_env()` in `setup_toolchain_env_ops()`.

Part-of: <gstreamer/cerbero!480>
parent 9c72eee0
......@@ -173,10 +173,6 @@ class ModifyEnvBase:
for i in ('append', 'prepend', 'set', 'remove'):
setattr(self, i + '_env', ModifyEnvFuncWrapper(self, i))
# Setup buildtype args; previously this was done by platform config files
# Except when using Meson or MSVC
if not isinstance(self, Meson) and not self.using_msvc():
self.setup_buildtype_env_ops()
def setup_buildtype_env_ops(self):
buildtype_args = '-Wall '
......@@ -395,6 +391,8 @@ class MakefilesBase (Build, ModifyEnvBase):
ModifyEnvBase.__init__(self)
self.setup_toolchain_env_ops()
if not self.using_msvc():
self.setup_buildtype_env_ops()
self.config_src_dir = os.path.abspath(os.path.join(self.build_dir,
self.srcdir))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment