diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-10-03 21:25:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-03 21:25:04 -0700 |
| commit | 10b44584ff0b1f49ece260a48f89eb59c123616f (patch) | |
| tree | 3bc4f127fe0ecfc81aed2d871820efa1aa133138 /mesonbuild/backend/ninjabackend.py | |
| parent | 264939963f696cbf768b1d7c8011d72a8064323f (diff) | |
| parent | 2fe400c350a49930c3fbe86602efa9e0950bb1cb (diff) | |
| download | meson-10b44584ff0b1f49ece260a48f89eb59c123616f.zip meson-10b44584ff0b1f49ece260a48f89eb59c123616f.tar.gz meson-10b44584ff0b1f49ece260a48f89eb59c123616f.tar.bz2 | |
Merge pull request #7795 from dcbaker/submit/full-compiler-annotations
Full annotations for the Compiler package
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index a086d37..e7165d2 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1689,7 +1689,7 @@ int dummy; else: expdir = basedir srctreedir = os.path.normpath(os.path.join(self.environment.get_build_dir(), self.build_to_src, expdir)) - sargs = swiftc.get_include_args(srctreedir) + sargs = swiftc.get_include_args(srctreedir, False) compile_args += sargs link_args = swiftc.get_output_args(os.path.join(self.environment.get_build_dir(), self.get_target_filename(target))) link_args += self.build.get_project_link_args(swiftc, target.subproject, target.for_machine) @@ -1700,7 +1700,7 @@ int dummy; abs_module_dirs = self.determine_swift_dep_dirs(target) module_includes = [] for x in abs_module_dirs: - module_includes += swiftc.get_include_args(x) + module_includes += swiftc.get_include_args(x, False) link_deps = self.get_swift_link_deps(target) abs_link_deps = [os.path.join(self.environment.get_build_dir(), x) for x in link_deps] for d in target.link_targets: |