diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-01-08 21:59:50 -0500 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-02-15 09:17:24 -0800 |
commit | d451a4bd97f827bb492fd0c0e357cb20b6056ed9 (patch) | |
tree | fa2b4704bb0132e81b2102ced301b5a7ac51c8de /mesonbuild/compilers/objcpp.py | |
parent | 3e9396f2590372f484149b48bf3f1c108c9111c3 (diff) | |
download | meson-d451a4bd97f827bb492fd0c0e357cb20b6056ed9.zip meson-d451a4bd97f827bb492fd0c0e357cb20b6056ed9.tar.gz meson-d451a4bd97f827bb492fd0c0e357cb20b6056ed9.tar.bz2 |
Remove get_cross_extra_flags
This is no longer needed, we just remove conditionals around it.
Diffstat (limited to 'mesonbuild/compilers/objcpp.py')
-rw-r--r-- | mesonbuild/compilers/objcpp.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py index e1b7a7d..add888f 100644 --- a/mesonbuild/compilers/objcpp.py +++ b/mesonbuild/compilers/objcpp.py @@ -31,14 +31,11 @@ class ObjCPPCompiler(CPPCompiler): # 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 = self.get_cross_extra_flags(environment, link=False) - if self.is_cross: - extra_flags += self.get_compile_only_args() with open(source_name, 'w') as ofile: ofile.write('#import<stdio.h>\n' 'class MyClass;' 'int main(int argc, char **argv) { return 0; }\n') - pc = subprocess.Popen(self.exelist + extra_flags + [source_name, '-o', binary_name]) + pc = subprocess.Popen(self.exelist + [source_name, '-o', binary_name]) pc.wait() if pc.returncode != 0: raise EnvironmentException('ObjC++ compiler %s can not compile programs.' % self.name_string()) |