Fix compilation of server daemon using Arch Linux.

OrchidTechnologies · Jul 12, 2024 · 4797a30 · 4797a30
1 parent 9f0c843
commit 4797a30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/env/sys-ubuntu.sh b/env/sys-ubuntu.sh
@@ -18,7 +18,9 @@ pushd "${sysroot}"
 # or maybe reimplement using multistrap? https://wiki.debian.org/Multistrap
 
 if [[ $(uname -s) = Linux ]]; then
-    # older versions of proot can't handle newer versions of glibc
+    # older versions of proot can't handle newer versions of glibc (so build one)
+    # XXX: https://github.com/proot-me/proot/pull/383
+    CFLAGS='-Wno-implicit-function-declaration' \
     flock "${mount}/proot.lock" "${MAKE:=make}" -C "${mount}/proot/src" PYTHON=false
     proot=${mount}/proot/src/proot
 

diff --git a/env/uname.mk b/env/uname.mk
@@ -13,6 +13,6 @@ uname-m := $(shell uname -m)
 uname-s := $(shell uname -s)
 uname-o := $(shell uname -o 2>/dev/null)
 
-objcopy = $(shell which $(host/$*)-objcopy objcopy 2>&1 | head -n1)
+objcopy = $(shell which $(host/$*)-objcopy objcopy 2>/dev/null | head -n1)
 
 -include $(pwd)/uname-$(uname-s).mk