summaryrefslogtreecommitdiffstats
path: root/scripts/lib/ptxd_make_world_common.sh
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-02-21 16:38:48 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-02-21 16:38:50 +0100
commitdc6a870c75d17266c11336668afcd113f1e58da4 (patch)
treeb287df96ba866ad7c40223b10ed284076c38c770 /scripts/lib/ptxd_make_world_common.sh
parentd6f903156e6488d34000dcae60568fa1121e888c (diff)
downloadptxdist-dc6a870c75d17266c11336668afcd113f1e58da4.tar.gz
ptxdist-dc6a870c75d17266c11336668afcd113f1e58da4.tar.xz
cleanup pkg-config environment handling
PTXCONF_PKG_CONFIG_PATH is never defined so remove the code that uses it. Define $PKG_CONFIG for all code paths. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_common.sh')
-rw-r--r--scripts/lib/ptxd_make_world_common.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh
index 85471ce22..ebc3ac22d 100644
--- a/scripts/lib/ptxd_make_world_common.sh
+++ b/scripts/lib/ptxd_make_world_common.sh
@@ -161,7 +161,7 @@ ptxd_make_world_init_compat() {
pkg_env="SYSROOT='${pkg_sysroot_dir}' V=${PTXDIST_VERBOSE} VERBOSE=${PTXDIST_VERBOSE/0/}"
case "${pkg_type}" in
target) pkg_env="${PTXDIST_CROSS_ENV_PKG_CONFIG} ${pkg_env}" ;;
- host|cross) pkg_env="PKG_CONFIG_LIBDIR='${PTXDIST_SYSROOT_HOST}/lib/pkgconfig:${PTXDIST_SYSROOT_HOST}/share/pkgconfig' ${pkg_env}" ;;
+ host|cross) pkg_env="${PTXDIST_HOST_ENV_PKG_CONFIG} ${pkg_env}" ;;
esac
}
export -f ptxd_make_world_init_compat