Print additional useful information immediately prior to

   VG_(panic)("VG_(mash_LD_PRELOAD_and_LD_LIBRARY_PATH) failed\n");

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@491

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 695d2a615f874c15f5b158c3a39eb291ddf91bc0..1095aa5122e17f01c6bc60ce8df343c4a695abb8 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1312,6 +1312,18 @@ void VG_(mash_LD_PRELOAD_and_LD_LIBRARY_PATH) ( Char* ld_preload_str,
       what, ld_preload_str, ld_library_path_str, 
       p_prel, p_path, VG_LIBDIR 
    );
+   VG_(printf)(
+      "\n"
+      "Note that this is often caused by mis-installation of valgrind.\n"
+      "Correct installation procedure is:\n"
+      "   ./configure --prefix=/install/dir\n"
+      "   make install\n"
+      "And then use /install/dir/bin/valgrind\n"
+      "Moving the installation directory elsewhere after 'make install'\n"
+      "will cause the above error.  Hand-editing the paths in the shell\n"
+      "scripts is also likely to cause problems.\n"
+      "\n"
+   );
    VG_(panic)("VG_(mash_LD_PRELOAD_and_LD_LIBRARY_PATH) failed\n");
 }
 

diff --git a/vg_main.c b/vg_main.c
index 695d2a615f874c15f5b158c3a39eb291ddf91bc0..1095aa5122e17f01c6bc60ce8df343c4a695abb8 100644 (file)
--- a/vg_main.c
+++ b/vg_main.c
@@ -1312,6 +1312,18 @@ void VG_(mash_LD_PRELOAD_and_LD_LIBRARY_PATH) ( Char* ld_preload_str,
       what, ld_preload_str, ld_library_path_str, 
       p_prel, p_path, VG_LIBDIR 
    );
+   VG_(printf)(
+      "\n"
+      "Note that this is often caused by mis-installation of valgrind.\n"
+      "Correct installation procedure is:\n"
+      "   ./configure --prefix=/install/dir\n"
+      "   make install\n"
+      "And then use /install/dir/bin/valgrind\n"
+      "Moving the installation directory elsewhere after 'make install'\n"
+      "will cause the above error.  Hand-editing the paths in the shell\n"
+      "scripts is also likely to cause problems.\n"
+      "\n"
+   );
    VG_(panic)("VG_(mash_LD_PRELOAD_and_LD_LIBRARY_PATH) failed\n");
 }