|
From: <sv...@va...> - 2005-09-25 10:30:55
|
Author: sewardj
Date: 2005-09-25 11:30:48 +0100 (Sun, 25 Sep 2005)
New Revision: 4760
Log:
Make inner valgrinds use a different VALGRIND_LIB. This isn't really
optional.
Modified:
branches/ASPACEM/coregrind/pub_core_libcproc.h
Modified: branches/ASPACEM/coregrind/pub_core_libcproc.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ASPACEM/coregrind/pub_core_libcproc.h 2005-09-25 10:16:46 UT=
C (rev 4759)
+++ branches/ASPACEM/coregrind/pub_core_libcproc.h 2005-09-25 10:30:48 UT=
C (rev 4760)
@@ -41,8 +41,14 @@
=20
/* The directory we look for all our auxillary files in. Useful for
running Valgrind out of a build tree without having to do "make
- install". */
-#define VALGRIND_LIB "VALGRIND_LIB"
+ install". Inner valgrinds require a different lib variable, else
+ they end up picking up .so's etc intended for the outer
+ valgrind. */
+#ifdef ENABLE_INNER
+# define VALGRIND_LIB "VALGRIND_LIB_INNER"
+#else
+# define VALGRIND_LIB "VALGRIND_LIB"
+#endif
=20
/* Additional command-line arguments; they are overridden by actual
command-line option. Each argument is separated by spaces. There
@@ -53,9 +59,8 @@
set by stage1 and read by stage2, and is used for recursive
invocations of Valgrind on child processes.=20
=20
- For self-hosting, the inner and outer Valgrinds must use different na=
mes
- to avoid collisions.
-*/
+ For self-hosting, the inner and outer Valgrinds must use different
+ names to avoid collisions. */
#ifdef ENABLE_INNER
# define VALGRIND_LAUNCHER "VALGRIND_LAUNCHER_INNER"
#else
|