diff --git a/build-userland b/build-userland index a9b3d2e..1b2f177 100755 --- a/build-userland +++ b/build-userland @@ -69,13 +69,13 @@ Default: build all examples that have their package dependencies met, e.g.: if in_ext in (self.env['c_ext'], self.env['asm_ext']): cc = self.env['gcc'] if c_std is None: - std = path_properties.default_c_std + std = path_properties.PathProperties.default_c_std else: std = c_std elif in_ext == self.env['cxx_ext']: cc = self.env['gxx'] if cxx_std is None: - std = path_properties.default_cxx_std + std = path_properties.PathProperties.default_cxx_std else: std = cxx_std os.makedirs(os.path.dirname(out_path), exist_ok=True) diff --git a/path_properties.py b/path_properties.py index f0e5487..8b8c417 100644 --- a/path_properties.py +++ b/path_properties.py @@ -5,6 +5,8 @@ import os from shell_helpers import LF class PathProperties: + default_c_std = 'c11' + default_cxx_std = 'c++17' default_properties = { 'allowed_archs': None, 'c_std': default_c_std, @@ -142,8 +144,6 @@ def get(path): path_properties.set_path_components(path_components) return path_properties -default_c_std = 'c11' -default_cxx_std = 'c++17' gnu_extension_properties = { 'c_std': 'gnu11', 'cc_pedantic': False,