diff options
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/objc.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/objcpp.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/swift.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/vala.py | 6 |
5 files changed, 12 insertions, 6 deletions
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index a83c17f..c4451c1 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -68,7 +68,8 @@ class FortranCompiler(CLikeCompiler, Compiler): source_name.write_text('print *, "Fortran compilation is working."; end') - extra_flags = environment.coredata.get_external_args(self.for_machine, self.language) + extra_flags = [] + extra_flags += environment.coredata.get_external_args(self.for_machine, self.language) extra_flags += environment.coredata.get_external_link_args(self.for_machine, self.language) extra_flags += self.get_always_args() # %% build the test executable "sanitycheckf" diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py index cc3fba9..52d258d 100644 --- a/mesonbuild/compilers/objc.py +++ b/mesonbuild/compilers/objc.py @@ -44,7 +44,8 @@ class ObjCCompiler(CLikeCompiler, Compiler): # TODO try to use sanity_check_impl instead of duplicated code source_name = os.path.join(work_dir, 'sanitycheckobjc.m') binary_name = os.path.join(work_dir, 'sanitycheckobjc') - extra_flags = environment.coredata.get_external_args(self.for_machine, self.language) + extra_flags = [] + extra_flags += environment.coredata.get_external_args(self.for_machine, self.language) if self.is_cross: extra_flags += self.get_compile_only_args() else: diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py index 9d58b45..c8b422b 100644 --- a/mesonbuild/compilers/objcpp.py +++ b/mesonbuild/compilers/objcpp.py @@ -43,7 +43,8 @@ class ObjCPPCompiler(CLikeCompiler, Compiler): # TODO try to use sanity_check_impl instead of duplicated code source_name = os.path.join(work_dir, 'sanitycheckobjcpp.mm') binary_name = os.path.join(work_dir, 'sanitycheckobjcpp') - extra_flags = environment.coredata.get_external_args(self.for_machine, self.language) + extra_flags = [] + extra_flags += environment.coredata.get_external_args(self.for_machine, self.language) if self.is_cross: extra_flags += self.get_compile_only_args() else: diff --git a/mesonbuild/compilers/swift.py b/mesonbuild/compilers/swift.py index 2d2c4e1..1942120 100644 --- a/mesonbuild/compilers/swift.py +++ b/mesonbuild/compilers/swift.py @@ -98,7 +98,8 @@ class SwiftCompiler(Compiler): src = 'swifttest.swift' source_name = os.path.join(work_dir, src) output_name = os.path.join(work_dir, 'swifttest') - extra_flags = environment.coredata.get_external_args(self.for_machine, self.language) + extra_flags = [] + extra_flags += environment.coredata.get_external_args(self.for_machine, self.language) if self.is_cross: extra_flags += self.get_compile_only_args() else: diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py index 012f16a..a5d49b6 100644 --- a/mesonbuild/compilers/vala.py +++ b/mesonbuild/compilers/vala.py @@ -94,7 +94,8 @@ class ValaCompiler(Compiler): def sanity_check(self, work_dir, environment): code = 'class MesonSanityCheck : Object { }' - extra_flags = environment.coredata.get_external_args(self.for_machine, self.language) + extra_flags = [] + extra_flags += environment.coredata.get_external_args(self.for_machine, self.language) if self.is_cross: extra_flags += self.get_compile_only_args() else: @@ -117,7 +118,8 @@ class ValaCompiler(Compiler): # no extra dirs are specified. if not extra_dirs: code = 'class MesonFindLibrary : Object { }' - args = env.coredata.get_external_args(self.for_machine, self.language) + args = [] + args += env.coredata.get_external_args(self.for_machine, self.language) vapi_args = ['--pkg', libname] args += vapi_args with self.cached_compile(code, env.coredata, extra_args=args, mode='compile') as p: |