From 0d49d7bcea3e40b3981918817aee8699c7ba0084 Mon Sep 17 00:00:00 2001 From: fche Date: Thu, 7 Jul 2005 18:43:36 +0000 Subject: 2005-07-07 Frank Ch. Eigler * Makefile.am (dist): Package up the source tree, including testsuite and runtime. * main.cxx: Use clog instead of cerr for logging messages. * buildrun.cxx: Ditto. (compile_pass): Add -Iruntime/user for test mode. * translate.cxx (*): Commonalize test/real mode output. * Makefile.in: Regenerated. --- buildrun.cxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'buildrun.cxx') diff --git a/buildrun.cxx b/buildrun.cxx index af22f1c8..151c5ecd 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -24,6 +24,8 @@ compile_pass (systemtap_session& s) string makefile_nm = s.tmpdir + "/Makefile"; ofstream o (makefile_nm.c_str()); o << "CFLAGS += -Werror" << endl; + if (s.test_mode) + o << "CFLAGS += -I \"" << s.runtime_path << "/user\"" << endl; o << "CFLAGS += -I \"" << s.runtime_path << "\"" << endl; o << "CFLAGS += -I \"" << s.runtime_path << "/relayfs\"" << endl; o << "obj-m := " << s.module_name << ".o" << endl; @@ -36,9 +38,14 @@ compile_pass (systemtap_session& s) if (! s.verbose) make_cmd += " -s"; make_cmd += string(" M=\"") + s.tmpdir + string("\" modules"); - if (s.verbose) cerr << "Running " << make_cmd << endl; + if (s.verbose) clog << "Running " << make_cmd << endl; int rc = system (make_cmd.c_str()); - if (s.verbose) cerr << "rc=" << rc << endl; + + + if (s.verbose) clog << "Pass 4: compiled into \"" + << s.module_name << ".ko" + << "\"" << endl; + return rc; } -- cgit