From e455d711dcef808eee18a8867ef4e37d59954863 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 10 Dec 2018 11:38:16 -0700
Subject: [PATCH] Reenable patched pkg-config
---
bin/x86_64-unknown-redox-pkg-config | 2 +-
config.sh | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
mode change 100644 => 100755 bin/x86_64-unknown-redox-pkg-config
diff --git a/bin/x86_64-unknown-redox-pkg-config b/bin/x86_64-unknown-redox-pkg-config
old mode 100644
new mode 100755
index 7693e6210..54776ef20
--- a/bin/x86_64-unknown-redox-pkg-config
+++ b/bin/x86_64-unknown-redox-pkg-config
@@ -4,4 +4,4 @@ export PKG_CONFIG_PATH=
export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_RECIPE}/sysroot"
export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig"
-exec pkg-config "$@"
+exec pkg-config --static "$@"
diff --git a/config.sh b/config.sh
index b08a2e594..fb4c4eeb1 100755
--- a/config.sh
+++ b/config.sh
@@ -23,11 +23,13 @@ export LD="${HOST}-ld"
export NM="${HOST}-nm"
export OBJCOPY="${HOST}-objcopy"
export OBJDUMP="${HOST}-objdump"
-#export PKG_CONFIG="${HOST}-pkg-config"
+export PKG_CONFIG="${HOST}-pkg-config"
export RANLIB="${HOST}-ranlib"
export READELF="${HOST}-readelf"
export STRIP="${HOST}-strip"
+export PKG_CONFIG_FOR_BUILD="pkg-config"
+
if [[ "$OSTYPE" == "darwin"* ]]; then
# GNU find
FIND="gfind";
--
GitLab