diff options
| author | Laurent Carlier <lordheavym@gmail.com> | 2017-07-11 13:42:59 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-17 11:50:42 +0530 |
| commit | 3e4668056386717e2fb39b6c1c79435facf84bc5 (patch) | |
| tree | 80cca55946333b6d3184665f552f7e3a7d2a61a5 | |
| parent | 1be77026373469ce4d71650adbba236df031a9f4 (diff) | |
| download | meson-3e4668056386717e2fb39b6c1c79435facf84bc5.zip meson-3e4668056386717e2fb39b6c1c79435facf84bc5.tar.gz meson-3e4668056386717e2fb39b6c1c79435facf84bc5.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 09c615a..c044d91 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -96,10 +96,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)) ofile.write('\n') def process_libs(self, libs): |