aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2010-08-16 09:37:19 -0500
committerPeter Seebach <seebs@laptop-seebs-net.local>2010-08-16 12:15:23 -0500
commit4416ede8800ec2652b40d72be3080c2416874074 (patch)
tree4bd496dae7baa2489294a2c2dc1c9927b17648b9
parentd30de158c1986d2161647629f279018702a42750 (diff)
downloadpseudo-4416ede8800ec2652b40d72be3080c2416874074.tar.gz
pseudo-4416ede8800ec2652b40d72be3080c2416874074.tar.bz2
pseudo-4416ede8800ec2652b40d72be3080c2416874074.zip
Fix ld_preload/ld_library_path mixup
Fix an obvious ld_preload/ld_library_path mixup in pseudo_util.c Signed-off-by: Richard Purdie <richard.purdie@intel.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--ChangeLog.txt3
-rw-r--r--pseudo_util.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index a448577..2feff1a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2010-08-16:
+ * (rp) Fix ld_preload/ld_library_path mixup.
+
2010-08-12:
* (seebs) Fix install of libpseudo so the plain library is created
when using $(SUFFIX), this is needed so pseudo daemons don't
diff --git a/pseudo_util.c b/pseudo_util.c
index bff33f1..7b942e4 100644
--- a/pseudo_util.c
+++ b/pseudo_util.c
@@ -652,7 +652,7 @@ pseudo_setupenv() {
if (!newenv) {
pseudo_diag("fatal: can't allocate new LD_LIBRARY_PATH variable.\n");
}
- snprintf(newenv, len, "%s:%s:%s64", ld_preload, libdir_path, libdir_path);
+ snprintf(newenv, len, "%s:%s:%s64", ld_library_path, libdir_path, libdir_path);
setenv("LD_LIBRARY_PATH", newenv, 1);
} else {
size_t len = strlen(libdir_path) + 1 + (strlen(libdir_path) + 2) + 1;