about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-11-19 21:52:24 +0000
committerC. McEnroe <june@causal.agency>2021-11-22 12:30:31 -0500
commit431230e0ea834d611d5302921b843f0afcaed391 (patch)
tree05a5c2bb3a1e13768ed5804efc43757ba979f440
parentCycle between adding colon suffix and not in tab complete (diff)
downloadcatgirl-master.tar.gz
catgirl-master.zip
Support custom pkg-config executable names HEAD master
When cross-compiling, it's common to have executables prefixed with
the name of the architecture you're building for,
e.g. aarch64-unknown-linux-musl-cc or x86_64-unknown-freebsd-pkg-config.
Lots of build tools support a PKG_CONFIG environment variable to
enable this use case.

With this change, I was able to successfully cross-compile and run
catgirl.
-rwxr-xr-xconfigure10
1 files changed, 6 insertions, 4 deletions
diff --git a/configure b/configure
index 4199980..3459f94 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -eu
 
+: ${PKG_CONFIG:=pkg-config}
+
 cflags() {
 	echo "CFLAGS += $*"
 }
@@ -8,16 +10,16 @@ defstr() {
 	cflags "-D'$1=\"$2\"'"
 }
 defvar() {
-	defstr "$1" "$(pkg-config --variable=$3 $2)${4:-}"
+	defstr "$1" "$(${PKG_CONFIG} --variable=$3 $2)${4:-}"
 }
 ldadd() {
 	lib=$1; shift
 	echo "LDADD.${lib} = $*"
 }
 config() {
-	pkg-config --print-errors "$@"
-	cflags $(pkg-config --cflags "$@")
-	for lib; do ldadd $lib $(pkg-config --libs $lib); done
+	${PKG_CONFIG} --print-errors "$@"
+	cflags $(${PKG_CONFIG} --cflags "$@")
+	for lib; do ldadd $lib $(${PKG_CONFIG} --libs $lib); done
 }
 
 exec >config.mk