aboutsummaryrefslogtreecommitdiff
path: root/backends.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-06-15 02:31:25 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-06-15 02:31:25 +0300
commit4887450de6ccaea5ce065b4544d4599d44161aa2 (patch)
tree5d57c18a57a44e562c2147235c73da2da4559880 /backends.py
parente967e5eb4bf2a46bb0d7f920fd4e8ffaa6f970fe (diff)
downloadmeson-4887450de6ccaea5ce065b4544d4599d44161aa2.zip
meson-4887450de6ccaea5ce065b4544d4599d44161aa2.tar.gz
meson-4887450de6ccaea5ce065b4544d4599d44161aa2.tar.bz2
Made gcc pch work again.
Diffstat (limited to 'backends.py')
-rwxr-xr-xbackends.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/backends.py b/backends.py
index 5adca9c..e567ed5 100755
--- a/backends.py
+++ b/backends.py
@@ -692,11 +692,12 @@ class NinjaBackend(Backend):
if '/' not in pch[0] or '/' not in pch[-1]:
raise interpreter.InvalidArguments('Precompiled header of "%s" must not be in the same direcotory as source, please put it in a subdirectory.' % target.get_basename())
compiler = self.get_compiler_for_lang(lang)
- src = os.path.join(self.build_to_src, target.get_source_subdir(), pch[-1])
if compiler.id == 'msvc':
+ src = os.path.join(self.build_to_src, target.get_source_subdir(), pch[-1])
(commands, dep, dst) = self.generate_msvc_pch_command(target, compiler, pch)
extradep = os.path.join(self.build_to_src, target.get_source_subdir(), pch[0])
else:
+ src = os.path.join(self.build_to_src, target.get_source_subdir(), pch[0])
(commands, dep, dst) = self.generate_gcc_pch_command(target, compiler, pch[0])
extradep = None
rulename = compiler.get_language() + '_PCH'