Commit 9b9a0fd1 authored by Mathieu Duponchelle's avatar Mathieu Duponchelle 🐸 Committed by Sebastian Dröge

all around: disable print_system_libs in calls to pkg-config

By default, pkg-config-rs sets the PKG_CONFIG_ALLOW_SYSTEM_LIBS
environment variable
(https://github.com/alexcrichton/pkg-config-rs/pull/35), which leads
to eg /usr/lib being present in the middle of the final command,
in turn leading to issues when working in an uninstalled environment,
where libraries that are also present system-wide do not get linked
against.
parent 6855a405
...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> { ...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> { ...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -49,6 +49,7 @@ fn find() -> Result<(), Error> { ...@@ -49,6 +49,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -33,6 +33,7 @@ fn find() -> Result<(), Error> { ...@@ -33,6 +33,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> { ...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -43,6 +43,7 @@ fn find() -> Result<(), Error> { ...@@ -43,6 +43,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -33,6 +33,7 @@ fn find() -> Result<(), Error> { ...@@ -33,6 +33,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> { ...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -47,6 +47,7 @@ fn find() -> Result<(), Error> { ...@@ -47,6 +47,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> { ...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -49,6 +49,7 @@ fn find() -> Result<(), Error> { ...@@ -49,6 +49,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> { ...@@ -45,6 +45,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
...@@ -49,6 +49,7 @@ fn find() -> Result<(), Error> { ...@@ -49,6 +49,7 @@ fn find() -> Result<(), Error> {
let mut config = Config::new(); let mut config = Config::new();
config.atleast_version(version); config.atleast_version(version);
config.print_system_libs(false);
if hardcode_shared_libs { if hardcode_shared_libs {
config.cargo_metadata(false); config.cargo_metadata(false);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment