summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2008-12-22 16:05:28 -0500
committerMasami Hiramatsu <mhiramat@redhat.com>2008-12-22 16:05:28 -0500
commite5976ba0af9b828dcc76b3937b5a98fe9c0f6cb8 (patch)
treee1ea624aa9d4105900544be8aaf7822dac7caba5
parent5bfd7a3769ba6dcfc9240357ad97f5243da37333 (diff)
downloadsystemtap-steved-e5976ba0af9b828dcc76b3937b5a98fe9c0f6cb8.tar.gz
systemtap-steved-e5976ba0af9b828dcc76b3937b5a98fe9c0f6cb8.tar.xz
systemtap-steved-e5976ba0af9b828dcc76b3937b5a98fe9c0f6cb8.zip
PR7090: Support kernels built with O= option.
-rw-r--r--ChangeLog6
-rw-r--r--buildrun.cxx5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ce59e0db..e5ed3ca1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-22 Masami Hiramatsu <mhiramat@redhat.com>
+
+ PR7090
+ * buildrun.cxx (compile_pass): Use flags macro to expand KBUILD_CFLAGS
+ for support kernels built with O= option.
+
2008-12-21 Will Cohen <wcohen@redhat.com>
* systemtap.spec: Add generations of tapset reference manual material.
diff --git a/buildrun.cxx b/buildrun.cxx
index ece9eda4..cef1b11a 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -82,8 +82,11 @@ compile_pass (systemtap_session& s)
if (s.verbose > 6)
redirecterrors = "";
+ // Support O= (or KBUILD_OUTPUT) option
+ o << "_KBUILD_CFLAGS := $(call flags,KBUILD_CFLAGS)" << endl;
+
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) " << redirecterrors << " ; then echo \"$(2)\"; else echo \"$(3)\"; 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) " << redirecterrors << " ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl;