diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-22 17:10:00 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-22 17:10:00 +0300 |
commit | d2b5e5c7a5cadc221bdc604cab12716238dbe4db (patch) | |
tree | 4c22179cf20582c1b8fea54e9cc3cb53de4889c4 /build.py | |
parent | ec167c81071bfc64fe62837ac1b156232655ca37 (diff) | |
download | meson-d2b5e5c7a5cadc221bdc604cab12716238dbe4db.zip meson-d2b5e5c7a5cadc221bdc604cab12716238dbe4db.tar.gz meson-d2b5e5c7a5cadc221bdc604cab12716238dbe4db.tar.bz2 |
The mass flags -> args renaming for consistency.
Diffstat (limited to 'build.py')
-rw-r--r-- | build.py | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -86,7 +86,7 @@ class Build: def get_configure_files(self): return self.configure_files - def get_global_flags(self, compiler): + def get_global_args(self, compiler): return self.global_args.get(compiler.get_language(), []) def get_external_args(self, compiler): @@ -241,12 +241,12 @@ class BuildTarget(): if not isinstance(cpplist, list): cpplist = [cpplist] self.add_compiler_args('cpp', cpplist) - self.link_flags = kwargs.get('link_flags', []) - if not isinstance(self.link_flags, list): - self.link_flags = [self.link_flags] - for i in self.link_flags: + self.link_args = kwargs.get('link_args', []) + if not isinstance(self.link_args, list): + self.link_args = [self.link_args] + for i in self.link_args: if not isinstance(i, str): - raise InvalidArguments('Link_flags arguments must be strings.') + raise InvalidArguments('Link_args arguments must be strings.') self.link_depends = kwargs.get('link_depends', []) if not isinstance(self.link_depends, list): self.link_depends = [self.link_depends] @@ -393,14 +393,14 @@ class BuildTarget(): ids.append(a) self.include_dirs += ids - def add_compiler_args(self, language, flags): - for a in flags: + def add_compiler_args(self, language, args): + for a in args: if not isinstance(a, str): raise InvalidArguments('A non-string passed to compiler args.') if language in self.extra_args: - self.extra_args[language] += flags + self.extra_args[language] += args else: - self.extra_args[language] = flags + self.extra_args[language] = args def get_aliaslist(self): return [] |