r=adilger

r=phil

include the version of the actual compiler we were compiled with.

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 5704e85..8852c23 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -24,6 +24,7 @@ lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o
 lload_LDADD := $(LIBREADLINE) -lptlctl
 liblustreapi_a_SOURCES = liblustreapi.c
 wirecheck_SOURCES = wirecheck.c
+wirecheck_CPPFLAGS = -DCC=\"$(CC)\"
 wiretest_SOURCES = wiretest.c
 lctl_SOURCES = parser.c obd.c lustre_cfg.c lctl.c parser.h obdctl.h
 lload_SOURCES = lload.c 

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index e9061d4..cc53e12 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -747,7 +747,7 @@ main(int argc, char **argv)
         char gccinfo[80];
 
         system_string("uname -a", unameinfo, sizeof(unameinfo));
-        system_string("gcc -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo));
+        system_string(CC " -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo));
 
         printf ("void lustre_assert_wire_constants(void)\n"
                 "{\n"