diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 45de9f84c..e70b81767 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-05  Christopher Faylor  <cgf@redhat.com>
+
+	* strace.cc (strace::hello): Set inited, when appropriate.
+
 2002-06-05  Christopher Faylor  <cgf@redhat.com>
 
 	* cygwin.din: Eliminate some newlib wrappers.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 6b59ed82c..420ac8daf 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -276,10 +276,10 @@ version.cc winver.o: winver_stamp
 	@ :
 
 shared_info_magic.h: cygmagic shared_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC)" ${word 2,$^} MOUNT_MAGIC 'class mount_info' SHARED_MAGIC 'class shared_info'
+	/bin/sh ${word 1,$^} $@ "$(CXX) -x c++" ${word 2,$^} MOUNT_MAGIC 'class mount_info' SHARED_MAGIC 'class shared_info'
 
 child_info_magic.h: cygmagic child_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC)" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
+	/bin/sh ${word 1,$^} $@ "$(CXX) -x c++" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
 
 dcrt0.o sigproc.o: child_info_magic.h
 
diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index 64a9cbc7c..f0eb799da 100644
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -37,6 +37,7 @@ strace::hello()
       return;
     }
 
+  inited = 1;
   if (!being_debugged ())
     return;