diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-03-25 11:41:16 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-03-25 11:41:16 -0400 |
| commit | 666d747e2a8880c2906c1e2ead49182cf061df74 (patch) | |
| tree | 12ae1700dd11b1ef13415b0349641cfb70e01982 /buildrun.cxx | |
| parent | d171a9ff5fda69cab247d2afd06ec5952941969e (diff) | |
| parent | b41a544e20a42413daa0323d2f149e9e34586ccf (diff) | |
| download | systemtap-steved-666d747e2a8880c2906c1e2ead49182cf061df74.tar.gz systemtap-steved-666d747e2a8880c2906c1e2ead49182cf061df74.tar.xz systemtap-steved-666d747e2a8880c2906c1e2ead49182cf061df74.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
Makefile.in
Diffstat (limited to 'buildrun.cxx')
| -rw-r--r-- | buildrun.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/buildrun.cxx b/buildrun.cxx index 48d4ea50..505589cf 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -356,7 +356,7 @@ run_pass (systemtap_session& s) // Build a tiny kernel module to query tracepoints int -make_tracequery(systemtap_session& s, string& name) +make_tracequery(systemtap_session& s, string& name, const vector<string>& extra_headers) { // create a subdirectory for the module string dir(s.tmpdir + "/tracequery"); @@ -393,6 +393,11 @@ make_tracequery(systemtap_session& s, string& name) osrc << "#define DEFINE_TRACE(name, proto, args) \\" << endl; osrc << " DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args))" << endl; + // PR9993: Add extra headers to work around undeclared types in individual + // include/trace/foo.h files + for (unsigned z=0; z<extra_headers.size(); z++) + osrc << "#include <" << extra_headers[z] << ">\n"; + // dynamically pull in all tracepoint headers from include/trace/ glob_t trace_glob; string globs[2] = { "/include/trace/*.h", "/source/include/trace/*.h" }; |