jdh approved fixes for building on vagrant/cgc vms.

Former-commit-id: eaff84b61819ebfac3d742847c0e28d642d30114

libIRDB/include/cfg/domgraph.hpp

@@ -22,9 +22,9 @@ class DominatorGraph_t
 
 		// get the immeidate (post) dominators for a node 
 		const BasicBlock_t* GetImmediateDominator(const BasicBlock_t* node)  const
-		{ auto it=idom_graph.find(node); return (it!=idom_graph.end()) ? it->second : NULL; }
+		{ BlockToBlockMap_t::const_iterator it=idom_graph.find(node); return (it!=idom_graph.end()) ? it->second : NULL; }
 		const BasicBlock_t* GetImmediatePostDominators(const BasicBlock_t* node)  const
-		{ auto it=post_idom_graph.find(node); return (it!=post_idom_graph.end()) ? it->second : NULL; }
+		{ BlockToBlockMap_t::const_iterator it=post_idom_graph.find(node); return (it!=post_idom_graph.end()) ? it->second : NULL; }
 
 
 	private:

libIRDB/src/cfg/SConscript

@@ -2,7 +2,7 @@ import os
 
 Import('env')
 
-myenv=env
+myenv=env.Clone()
 myenv.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])