diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp b/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
index dfc047a354742d5d9b01c192159d478be027b0cd..3ac623fb42c6909c2ca0256005c80f9c6eec107c 100644
--- a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
+++ b/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
@@ -229,7 +229,14 @@ void CodeGenTraversal::initRuntimeAPI() {
 
   // Load Runtime API Module
   SMDiagnostic Err;
-  runtimeModule = ParseIRFile("/home/psrivas2/current-src/projects/visc-rt/visc-rt.ll", Err, M.getContext());
+
+  char* LLVM_SRC_ROOT = getenv("LLVM_SRC_ROOT");
+  assert(LLVM_SRC_ROOT != NULL && "Define LLVM_SRC_ROOT environment variable!");
+
+  Twine runtimeAPI = LLVM_SRC_ROOT;
+  runtimeAPI = runtimeAPI+"/projects/visc-rt/visc-rt.ll";
+
+  runtimeModule = ParseIRFile(runtimeAPI.str(), Err, M.getContext());
   if(runtimeModule == NULL)
     DEBUG(errs() << Err.getMessage());
   else
diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/Makefile b/llvm/lib/Transforms/DFG2LLVM_NVPTX/Makefile
index fb84552e4991d81d1ca2e99e0f6d804f57f53651..05301e44e7368f5ea4e9c9dfb9805d50abb13580 100644
--- a/llvm/lib/Transforms/DFG2LLVM_NVPTX/Makefile
+++ b/llvm/lib/Transforms/DFG2LLVM_NVPTX/Makefile
@@ -10,6 +10,7 @@
 LEVEL = ../../../
 LIBRARYNAME = LLVMDFG2LLVM_NVPTX
 LOADABLE_MODULE = 1
+#CXXFLAGS+= -Wc++11-extensions 
 #SHARED_LIBRARY = 1
 #BUILD_ARCHIVE = 1
 #USEDLIBS =
diff --git a/llvm/test/VISC/lit.local.cfg b/llvm/test/VISC/lit.local.cfg
index 4edd662ded24a63143167ca1ace2103aed39e90c..6f2da0516150a22c8631e4f58580f49f3f2b1a76 100644
--- a/llvm/test/VISC/lit.local.cfg
+++ b/llvm/test/VISC/lit.local.cfg
@@ -1,2 +1,4 @@
-llvm_src = '/home/psrivas2/Hetero/VISC/Code/trunk/llvm'
+llvm_src = os.environ.get('LLVM_SRC_ROOT')
+if llvm_src == None:
+  lit.fatal('Define environment variable LLVM_SRC_ROOT')
 config.substitutions.append(('%llvm_src', llvm_src))
diff --git a/llvm/test/lit.cfg b/llvm/test/lit.cfg
index 8272e97c3856f89eba82d63e53eaf0a4a951c2f8..8774ab522c8eedc1fba581a44b600f422494e909 100644
--- a/llvm/test/lit.cfg
+++ b/llvm/test/lit.cfg
@@ -126,6 +126,7 @@ if config.test_exec_root is None:
 
     # Get the source and object roots.
     llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
+    print llvm_src_root
     llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
 
     # Validate that we got a tree which points to here.