Merge #1166

1166: freebsd: include memstat in build image r=Emilgardis a=taiki-e libc 0.2.138 added memstat_* functions, but the build with cross fails because the build image does not contain the corresponding library. See rust-lang/libc#3025 for more context. See also rust-lang/rust#105222 which is the same fix to rust-lang/rust's build image. Co-authored-by: Taiki Endo <te316e89@gmail.com>
cross-rs · Dec 4, 2022 · 80a49b3 · 80a49b3
2 parents 36d9ce1 + 87955f5
commit 80a49b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changes/1166.json b/.changes/1166.json
@@ -0,0 +1,4 @@
+{
+    "description": "freebsd: include memstat in build image to fix build with libc 0.2.138 and up.",
+    "type": "fixed"
+}
diff --git a/docker/freebsd.sh b/docker/freebsd.sh
@@ -186,8 +186,9 @@ main() {
     cp -r "${td}/freebsd/lib/"* "${destdir}/lib"
     cp "${td}/freebsd/usr/lib/libc++.so.1" "${destdir}/lib"
     cp "${td}/freebsd/usr/lib/libc++.a" "${destdir}/lib"
-    cp "${td}/freebsd/usr/lib"/lib{c,util,m,ssp_nonshared}.a "${destdir}/lib"
+    cp "${td}/freebsd/usr/lib"/lib{c,util,m,ssp_nonshared,memstat}.a "${destdir}/lib"
     cp "${td}/freebsd/usr/lib"/lib{rt,execinfo,procstat}.so.1 "${destdir}/lib"
+    cp "${td}/freebsd/usr/lib"/libmemstat.so.3 "${destdir}/lib"
     cp "${td}/freebsd/usr/lib"/{crt1,Scrt1,crti,crtn}.o "${destdir}/lib"
     cp "${td}/freebsd/usr/lib"/libkvm.a "${destdir}/lib"