diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-02-15 14:29:08 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-02-15 14:29:08 -0500 |
| commit | 0f05501579dc0a4e66ccbbd8e0b29d052d9b5920 (patch) | |
| tree | 79bf8b7b328e87e8c30cc64e64a1bea9a6f2dca5 /buildrun.cxx | |
| parent | 044427bcdfa2a1d58a912bf96546892bef82b717 (diff) | |
| parent | 275f40a6d612f94e5272eeed772e9c9294cb8e1f (diff) | |
| download | systemtap-steved-0f05501579dc0a4e66ccbbd8e0b29d052d9b5920.tar.gz systemtap-steved-0f05501579dc0a4e66ccbbd8e0b29d052d9b5920.tar.xz systemtap-steved-0f05501579dc0a4e66ccbbd8e0b29d052d9b5920.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'buildrun.cxx')
| -rw-r--r-- | buildrun.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
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; |