diff options
| author | Oskar Sigvardsson <oskarsigvardsson@gmail.com> | 2020-10-04 12:57:02 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-10-04 14:52:28 +0200 |
| commit | 1d443f1bc6ecd1bc793e7af15b69bc70830062db (patch) | |
| tree | 45ebcaaa317b23cb18f3745a22f3b577bfc216b2 /mesonbuild/backend/xcodebackend.py | |
| parent | 1dfaccfd9129aa4ac24b46f0a9490b19ae59adc0 (diff) | |
| download | meson-1d443f1bc6ecd1bc793e7af15b69bc70830062db.zip meson-1d443f1bc6ecd1bc793e7af15b69bc70830062db.tar.gz meson-1d443f1bc6ecd1bc793e7af15b69bc70830062db.tar.bz2 | |
Fixed using files object in subdir with xcode backend
Fixes bug #589. When generating string from file object, it didn't take subdir
into account.
Diffstat (limited to 'mesonbuild/backend/xcodebackend.py')
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 3fe6574..ef0c956 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -264,7 +264,7 @@ class XCodeBackend(backends.Backend): for s in t.sources: if isinstance(s, mesonlib.File): - s = s.fname + s = os.path.join(s.subdir, s.fname) if isinstance(s, str): s = os.path.join(t.subdir, s) |