2008-03-13 Frank Ch. Eigler <fche@elastic.org>

	PR 5928.
	* buildrun.cxx (compile_pass): Use EXTRA_CFLAGS for autoconf'd values
	instead of CFLAGS_<module>.o.

diff --git a/ChangeLog b/ChangeLog
index 93812f17b287fe1cad6db4ab9d0fc34b4b00b915..280cb68ee2fda247bee5229562181a68671ba133 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-13  Frank Ch. Eigler  <fche@elastic.org>
+
+       PR 5928.
+       * buildrun.cxx (compile_pass): Use EXTRA_CFLAGS for autoconf'd values
+       instead of CFLAGS_<module>.o.
+
 2008-03-12  Frank Ch. Eigler  <fche@elastic.org>
 
        * configure.ac, systemtap.spec.in: Bumped version to 0.6.2.

diff --git a/buildrun.cxx b/buildrun.cxx
index f3f29d4919b4e5460e07d002e17572409323a90c..8504cf62678ae0ce98ec064149aa235e0dff82d8 100644 (file)
--- 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;