ensure module caching does not ignore possibly changing -d MODULE options

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 875ef31d..5c4d60df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-11  Frank Ch. Eigler  <fche@elastic.org>
+
+	* hash.cxx (find_hash): Mix in -d MODULE names.
+
 2008-07-10  Frank Ch. Eigler  <fche@elastic.org>
 
 	* main.cxx (main): If "-k" (save temp directory) was supplied, 
diff --git a/hash.cxx b/hash.cxx
index c41600d2..2c1bfb25 100644
--- a/hash.cxx
+++ b/hash.cxx
@@ -1,5 +1,5 @@
 // Copyright (C) Andrew Tridgell 2002 (original file)
-// Copyright (C) 2006-2007 Red Hat Inc. (systemtap changes)
+// Copyright (C) 2006-2008 Red Hat Inc. (systemtap changes)
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -115,7 +115,14 @@ find_hash (systemtap_session& s, const string& script)
   for (unsigned i = 0; i < s.macros.size(); i++)
     h.add(s.macros[i]);
 
-  // Hash runtime path (that gets added in as "-I path").
+  // -d MODULE
+  for (set<string>::iterator it = s.unwindsym_modules.begin();
+       it != s.unwindsym_modules.end();
+       it++)
+    h.add(*it);
+    // XXX: a build-id of each module might be even better
+
+  // Hash runtime path (that gets added in as "-R path").
   h.add(s.runtime_path);
 
   // Hash compiler path, size, and mtime.  We're just going to assume