diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-17 18:53:12 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-05-17 18:53:12 +0300 |
| commit | 852fb28888c737be359209d300475fa5bb249477 (patch) | |
| tree | ddba61bb75c5d363ee3e3bc4c1123676ca4ea96a | |
| parent | cf0bd77ddd2cd952f17e3485ea1d9e6fc159adb1 (diff) | |
| download | meson-852fb28888c737be359209d300475fa5bb249477.zip meson-852fb28888c737be359209d300475fa5bb249477.tar.gz meson-852fb28888c737be359209d300475fa5bb249477.tar.bz2 | |
Do not use -o with Vala. Closes #120.
| -rw-r--r-- | compilers.py | 3 | ||||
| -rw-r--r-- | ninjabackend.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/compilers.py b/compilers.py index ebebc8f..575bd62 100644 --- a/compilers.py +++ b/compilers.py @@ -801,14 +801,13 @@ class ValaCompiler(): def sanity_check(self, work_dir): src = 'valatest.vala' - obj = 'valatest.c' source_name = os.path.join(work_dir, src) ofile = open(source_name, 'w') ofile.write('''class SanityCheck : Object { } ''') ofile.close() - pc = subprocess.Popen(self.exelist + ['-C', '-o', obj, src], cwd=work_dir) + pc = subprocess.Popen(self.exelist + ['-C', '-c', src], cwd=work_dir) pc.wait() if pc.returncode != 0: raise EnvironmentException('Vala compiler %s can not compile programs.' % self.name_string()) diff --git a/ninjabackend.py b/ninjabackend.py index f3e8587..1f63273 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -683,7 +683,7 @@ class NinjaBackend(backends.Backend): continue args = ['-d', self.get_target_private_dir(target)] sc = os.path.basename(s.fname)[:-4] + 'c' - args += ['-C', '-o', sc] + args += ['-C'] vapi_order_deps = [] for (sourcefile, vapi_info) in fast_vapis.items(): if sourcefile == s: |