diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-03-28 12:34:05 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-03-28 12:34:05 -0400 |
| commit | 5e5189b38b0b1b788d32190361961d18e4456ae6 (patch) | |
| tree | d388205113589bf73857efc6ef997bc8c39e112b /buildrun.cxx | |
| parent | bf6c85c35a749ca8cc6bea20a7774d063c218938 (diff) | |
| parent | 1e00cfb1b6caa8b8ac343fac8e3d08f2d6a5d785 (diff) | |
| download | systemtap-steved-5e5189b38b0b1b788d32190361961d18e4456ae6.tar.gz systemtap-steved-5e5189b38b0b1b788d32190361961d18e4456ae6.tar.xz systemtap-steved-5e5189b38b0b1b788d32190361961d18e4456ae6.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
* 'master' of git://sources.redhat.com/git/systemtap: (24 commits)
2008-03-27 Frank Ch. Eigler <fche@elastic.org>
2008-03-27 Frank Ch. Eigler <fche@elastic.org>
2008-03-26 Frank Ch. Eigler <fche@elastic.org>
Revert "dummy commit"
dummy commit
* clarify utility of epilogue-type probe aliases in documentation
2008-03-23 Frank Ch. Eigler <fche@elastic.org>
2008-03-23 Frank Ch. Eigler <fche@elastic.org>
2008-03-21 Eugene Teo <eugeneteo@kernel.sg>
spelling fixes
2008-03-20 Frank Ch. Eigler <fche@elastic.org>
* clarify $variables available in .return probes
2008-03-20 Frank Ch. Eigler <fche@elastic.org>
2008-03-17 Eugene Teo <eteo@redhat.com>
* systemtap.base/maxactive.exp, probefunc.exp: Standardize pass msg.
2008-03-14 Masami Hiramatsu <mhiramat@redhat.com>
2008-03-13 Frank Ch. Eigler <fche@elastic.org>
* release prep: 0.6.2 version bump
2008-03-12 Dave Brolley <brolley@redhat.com>
2008-03-11 Will Cohen <wcohen@redhat.com>
...
Diffstat (limited to 'buildrun.cxx')
| -rw-r--r-- | buildrun.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/buildrun.cxx b/buildrun.cxx index f3f29d49..f3e72272 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -74,16 +74,18 @@ compile_pass (systemtap_session& s) // Create makefile // 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 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; + string superverbose; + if (s.verbose > 3) + superverbose = "set -x;"; + o << "stap_check_gcc = $(shell " << superverbose << " 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 " << superverbose << " 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; // "autoconf" options go here - // enum hrtimer_mode renaming near 2.6.21; see tapsets.cxx hrtimer_derived_probe_group::emit_module_decls - string module_cflags = "CFLAGS_" + s.module_name + ".o"; + string module_cflags = "EXTRA_CFLAGS"; o << module_cflags << " :=" << endl; o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-hrtimer-rel.c, -DSTAPCONF_HRTIMER_REL,)" << endl; o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-inode-private.c, -DSTAPCONF_INODE_PRIVATE,)" << endl; @@ -93,6 +95,7 @@ compile_pass (systemtap_session& s) o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-x86-uniregs.c, -DSTAPCONF_X86_UNIREGS,)" << endl; o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-nameidata.c, -DSTAPCONF_NAMEIDATA_CLEANUP,)" << endl; + o << module_cflags << " += $(call stap_check_build, $(SYSTEMTAP_RUNTIME)/autoconf-unregister-kprobes.c, -DSTAPCONF_UNREGISTER_KPROBES,)" << endl; for (unsigned i=0; i<s.macros.size(); i++) o << "EXTRA_CFLAGS += -D " << lex_cast_qstring(s.macros[i]) << endl; |