Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: easybuilders/easybuild-easyblocks
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b10b405bb8d0dab2c5f4a2467d983df40892a1e9
Choose a base ref
..
head repository: easybuilders/easybuild-easyblocks
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4db35a4d000e0c754f829eb05e6cd7ce64fa256c
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +3 −3 easybuild/easyblocks/generic/mesonninja.py
6 changes: 3 additions & 3 deletions easybuild/easyblocks/generic/mesonninja.py
Original file line number Diff line number Diff line change
@@ -69,9 +69,9 @@ def build_type(self):
# While we do set optimization and debug flag separately, build scripts may be adding additional
# defines and flags based on the build_type as well so we pick the closest match.
if build_type is None:
if self.toolchain.options.get('noopt', None): # also implies debug but is the closest match
if self.toolchain.options.get('noopt', False): # also implies debug but is the closest match
build_type = 'debug'
elif self.toolchain.options.get('debug', None):
elif self.toolchain.options.get('debug', False):
build_type = 'debugoptimized'
else:
build_type = 'release'
@@ -130,7 +130,7 @@ def configure_step(self, cmd_prefix=''):
'buildtype': self.build_type,
'optimization': self.optimization,
'debug': '--debug' if self.toolchain.options.get('debug', False) else '',
'ndebug': '-Db_ndebug=true' if self.toolchain.options.get('noopt', None) else '',
'ndebug': '' if self.toolchain.options.get('noopt', False) else '-Db_ndebug=true'
}
res = run_shell_cmd(cmd)
return res.output