From b54581ce1053d848cfc61d438ec42f4456233275 Mon Sep 17 00:00:00 2001 From: fche Date: Thu, 7 Feb 2008 18:36:29 +0000 Subject: 2008-02-07 Frank Ch. Eigler * buildrun.cxx (run_make_cmd, compile_pass): Tweak kbuild parametrization to produce useful compile logs at -vv. --- ChangeLog | 5 +++++ buildrun.cxx | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d205f8c..17a7cb7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-07 Frank Ch. Eigler + + * buildrun.cxx (run_make_cmd, compile_pass): Tweak kbuild + parametrization to produce useful compile logs at -vv. + 2008-02-04 David Smith PR 4446 (partial) diff --git a/buildrun.cxx b/buildrun.cxx index b41b9545..66cc4986 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -47,8 +47,10 @@ run_make_cmd(systemtap_session& s, string& make_cmd) cerr << "unsetenv failed: " << e << endl; } - if (s.verbose > 1) + if (s.verbose > 2) make_cmd += " V=1"; + else if (s.verbose > 1) + make_cmd += " >/dev/null"; else make_cmd += " -s >/dev/null 2>&1"; @@ -73,7 +75,7 @@ compile_pass (systemtap_session& s) // Clever hacks copied from vmware modules o << "stap_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo \"$(1)\"; else echo \"$(2)\"; fi)" << endl; - o << "stap_check_build = $(shell " << "set -x; " << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl; + o << "stap_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl; o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl; -- cgit