From f272aaccb24b64bf1baa1d70722e0608d654297f Mon Sep 17 00:00:00 2001
From: guanglei <guanglei>
Date: Tue, 9 May 2006 09:33:19 +0000
Subject: -M option to control to do merge or not for bulk mode

---
 buildrun.cxx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'buildrun.cxx')

diff --git a/buildrun.cxx b/buildrun.cxx
index f71af527..ab2b85f6 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -113,6 +113,7 @@ run_pass (systemtap_session& s)
     + string(PKGLIBDIR) + "/stpd "
     + (s.bulk_mode ? "" : "-r ")
     + (s.verbose>1 ? "" : "-q ")
+    + (s.merge ? "" : "-m ")
     + "-u " + username + " "
     + (s.output_file.empty() ? "" : "-o " + s.output_file + " ");
   
-- 
cgit