From 0283a2fb41fb4c25be1d0078bb40ae761d47462a Mon Sep 17 00:00:00 2001 From: Laurent Carlier Date: Tue, 11 Jul 2017 13:42:59 +0200 Subject: pkgconfig: avoid appending slash at Cflags otherwise it can break some compilations, see https://bugs.archlinux.org/task/54763 --- mesonbuild/modules/pkgconfig.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mesonbuild/modules/pkgconfig.py') 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) -- cgit v1.1