diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-27 02:49:57 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-27 02:49:57 +0300 |
commit | ff4b32741acb36e8b2cf3d83fe0d513ad5753e59 (patch) | |
tree | aaa858045f6d7b8fe8f0920a31a26b5dff459c0d /mesonbuild | |
parent | 1f63044f6e2e4ef884979a1552a76ee030f12ad1 (diff) | |
download | meson-ff4b32741acb36e8b2cf3d83fe0d513ad5753e59.zip meson-ff4b32741acb36e8b2cf3d83fe0d513ad5753e59.tar.gz meson-ff4b32741acb36e8b2cf3d83fe0d513ad5753e59.tar.bz2 |
Thank you git for silently discarding unrelated changes on conflicts. It is very helpful.
Diffstat (limited to 'mesonbuild')
-rw-r--r-- | mesonbuild/compilers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 85b56a6..7f1897c 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) |