From e75deb3f18161d0bc196854375d402cee1b451fa Mon Sep 17 00:00:00 2001 From: Avi Weinstock Date: Tue, 23 Jun 2015 10:38:46 -0400 Subject: [PATCH] Fix setting of PKG_CONFIG_PATH and DYLD_LIBRARY_PATH in env.sh PKG_CONFIG_PATH was definitely being set incorrectly, as radare2-binding's configure script was complaining about not finding r_core via pkg-config. I wasn't noticing any issues related to DYLD_LIBRARY_PATH, but it looked like it was clobbering the old value of it with LD_LIBRARY_PATH, rather than just prepending the new value. --- env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env.sh b/env.sh index a08bf425032e1..87233b4aa7642 100755 --- a/env.sh +++ b/env.sh @@ -10,8 +10,8 @@ new_env=' LIBR_PLUGINS=${pfx}/lib/radare2 PATH=$pfx/bin:${PATH} LD_LIBRARY_PATH=$pfx/lib:$LD_LIBRARY_PATH -DYLD_LIBRARY_PATH=$pfx/lib:$LD_LIBRARY_PATH -PKG_CONFIG_PATH=$PWD/libr/ +DYLD_LIBRARY_PATH=$pfx/lib:$DYLD_LIBRARY_PATH +PKG_CONFIG_PATH=$pfx/lib/pkgconfig:$PKG_CONFIG_PATH ' [ -n "$2" ] && SHELL=$2