From ff4b32741acb36e8b2cf3d83fe0d513ad5753e59 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 27 Mar 2017 02:49:57 +0300 Subject: [PATCH] Thank you git for silently discarding unrelated changes on conflicts. It is very helpful. --- mesonbuild/compilers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 85b56a655..7f1897ceb 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1790,7 +1790,7 @@ class SwiftCompiler(Compiler): source_name = os.path.join(work_dir, src) output_name = os.path.join(work_dir, 'swifttest') with open(source_name, 'w') as ofile: - ofile.write('''1 + 2 + ofile.write('''print("Swift compilation is working.") ''') extra_flags = self.get_cross_extra_flags(environment, compile=True, link=True) pc = subprocess.Popen(self.exelist + extra_flags + ['-emit-executable', '-o', output_name, src], cwd=work_dir)