Merge #386

bors[bot] · Guillaume Desmottes · web-flow · commit 2aa89908b9c3 · 2020-03-06T10:34:17.000Z
386: docker: define PKG_CONFIG_ALLOW_CROSS r=reitermarkus a=gdesmott The PKG_CONFIG_ALLOW_CROSS env variable is required to cross compile various crates such as openssl. Fix #383 Co-authored-by: Guillaume Desmottes <guillaume.desmottes@collabora.com>
diff --git a/src/docker.rs b/src/docker.rs
@@ -101,6 +101,8 @@ pub fn run(target: &Target,
         }
     }
 
+    docker.args(&["-e", "PKG_CONFIG_ALLOW_CROSS=1"]);
+
     docker.arg("--rm");
 
     // We need to specify the user for Docker, but not for Podman.

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ pub fn run(target: &Target,`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ docker.args(&["-e", "PKG_CONFIG_ALLOW_CROSS=1"]);`
	`105`	`+`
`104`	`106`	`docker.arg("--rm");`
`105`	`107`
`106`	`108`	`// We need to specify the user for Docker, but not for Podman.`