tracequery build fix

Similar to commit 392e08b7 -- we need to #undef TRACE_INCLUDE_FILE
before each header in the tracepoint query module, so they can be
queried all at once.

The side effect was that the all-inclusive tracequery build would fail,
so we'd fall back to building a separate tracequery for each header.
It's much faster when we can build them together.

* buildrun.cxx (make_tracequery): #undef TRACE_INCLUDE_FILE before each
  tracepoint header to prevent macro redefinition.

diff --git a/buildrun.cxx b/buildrun.cxx
index f10ed04263c6bbee7476d766d04c8c52898bea28..d8d35c17a963089a38f112655a2556b48f656f76 100644 (file)
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -500,7 +500,8 @@ make_tracequery(systemtap_session& s, string& name,
 
   // add the specified headers
   for (unsigned z=0; z<headers.size(); z++)
-    osrc << "#include <" << headers[z] << ">\n";
+    osrc << "#undef TRACE_INCLUDE_FILE\n"
+         << "#include <" << headers[z] << ">\n";
 
   // finish up the module source
   osrc << "#endif /* CONFIG_TRACEPOINTS */" << endl;