diff options
| author | mostynb <mostynb@opera.com> | 2015-08-19 10:16:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-19 17:17:29 +0000 |
| commit | f5c7b1a39088d8b2f78132b5488319d986abd16a (patch) | |
| tree | b1cd636debd3a276ade4025f3ce7b5038b14e116 | |
| parent | 7b56c105167a2904bd84f6126ec4f080b7e238c1 (diff) | |
| download | chromium_src-f5c7b1a39088d8b2f78132b5488319d986abd16a.zip chromium_src-f5c7b1a39088d8b2f78132b5488319d986abd16a.tar.gz chromium_src-f5c7b1a39088d8b2f78132b5488319d986abd16a.tar.bz2 | |
pkg-config.py should use --libs instead of --libs-only-l --libs-only-L
When specifying both --libs-only-l and --libs-only-L to
pkg-config, the results from the latter are not included.
This feels like a bug in pkg-config, reported upstream:
https://bugs.freedesktop.org/show_bug.cgi?id=91689
Our pkg-config.py wrapper can use --libs instead of the
flags mentioned above- this includes flags from both but
maybe also some additional flags (eg -rdynamic).
BUG=522564
Review URL: https://codereview.chromium.org/1291803008
Cr-Commit-Position: refs/heads/master@{#344260}
| -rw-r--r-- | build/config/linux/pkg-config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/config/linux/pkg-config.py b/build/config/linux/pkg-config.py index fadcc0b..3ebc13d 100644 --- a/build/config/linux/pkg-config.py +++ b/build/config/linux/pkg-config.py @@ -153,7 +153,7 @@ if options.libdir: try: flag_string = subprocess.check_output( - [ options.pkg_config, "--cflags", "--libs-only-l", "--libs-only-L" ] + + [ options.pkg_config, "--cflags", "--libs" ] + args, env=os.environ) # For now just split on spaces to get the args out. This will break if # pkgconfig returns quoted things with spaces in them, but that doesn't seem |