diff options
| author | Laurent Carlier <lordheavym@gmail.com> | 2017-07-11 13:42:59 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-13 16:28:32 +0200 |
| commit | 0283a2fb41fb4c25be1d0078bb40ae761d47462a (patch) | |
| tree | 10e86034e2298da9976ddcfb30d61f4ad4b5bc47 | |
| parent | 138a8b221b2a1067d4702fe12bccd8e100c801de (diff) | |
| download | meson-0283a2fb41fb4c25be1d0078bb40ae761d47462a.zip meson-0283a2fb41fb4c25be1d0078bb40ae761d47462a.tar.gz meson-0283a2fb41fb4c25be1d0078bb40ae761d47462a.tar.bz2 | |
pkgconfig: avoid appending slash at Cflags
otherwise it can break some compilations, see https://bugs.archlinux.org/task/54763
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 2dfdbc0..75a6ad2 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -97,10 +97,11 @@ class PkgConfigModule(ExtensionModule): ofile.write('Libs.private: {}\n'.format(' '.join(generate_libs_flags(priv_libs)))) ofile.write('Cflags:') for h in subdirs: - if h == '.': - h = '' ofile.write(' ') - ofile.write(os.path.join('-I${includedir}', h)) + if h == '.': + ofile.write('-I${includedir}') + else: + ofile.write(os.path.join('-I${includedir}', h)) for f in extra_cflags: ofile.write(' ') ofile.write(f) |