diff --git a/benchmarks/new_opencl/bfs/Makefile b/benchmarks/new_opencl/bfs/Makefile
index 2a11412e..54bd3805 100644
--- a/benchmarks/new_opencl/bfs/Makefile
+++ b/benchmarks/new_opencl/bfs/Makefile
@@ -1,8 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -17,7 +19,7 @@ SRCS = main.cc
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/compiler/bin/poclcc b/benchmarks/new_opencl/compiler/bin/poclcc
index 0b2e0875..f52d7830 100755
Binary files a/benchmarks/new_opencl/compiler/bin/poclcc and b/benchmarks/new_opencl/compiler/bin/poclcc differ
diff --git a/benchmarks/new_opencl/compiler/lib/libOpenCL.so.2.5.0 b/benchmarks/new_opencl/compiler/lib/libOpenCL.so.2.5.0
index 11c276ec..b91277a7 100644
Binary files a/benchmarks/new_opencl/compiler/lib/libOpenCL.so.2.5.0 and b/benchmarks/new_opencl/compiler/lib/libOpenCL.so.2.5.0 differ
diff --git a/benchmarks/new_opencl/convolution/Makefile b/benchmarks/new_opencl/convolution/Makefile
index 7d8df9a4..d0c878f7 100644
--- a/benchmarks/new_opencl/convolution/Makefile
+++ b/benchmarks/new_opencl/convolution/Makefile
@@ -1,7 +1,10 @@
-LLVM_LIB_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops/lib)
-POCLCC_PATH ?= $(wildcard ../compiler)
-POCLRT_PATH ?= $(wildcard ../runtime)
-DRIVER_PATH ?= $(wildcard ../../../driver/sw)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -16,7 +19,7 @@ SRCS = main.cpp utils.cpp
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(LLVM_LIB_PATH):$(POCLCC_PATH)/lib:$(DRIVER_PATH)/simx $(POCLCC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/guassian/Makefile b/benchmarks/new_opencl/guassian/Makefile
index 52f60500..2584104d 100644
--- a/benchmarks/new_opencl/guassian/Makefile
+++ b/benchmarks/new_opencl/guassian/Makefile
@@ -1,8 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -17,7 +19,7 @@ SRCS = main.cc clutils.cpp utils.cpp
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/kmeans/Makefile b/benchmarks/new_opencl/kmeans/Makefile
index 65860dd6..d08ff166 100644
--- a/benchmarks/new_opencl/kmeans/Makefile
+++ b/benchmarks/new_opencl/kmeans/Makefile
@@ -1,8 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -17,7 +19,7 @@ SRCS = main.cc read_input.c rmse.c kmeans_clustering.c cluster.c getopt.c
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/kmeans/libkmeans.a b/benchmarks/new_opencl/kmeans/libkmeans.a
deleted file mode 100644
index 74640506..00000000
Binary files a/benchmarks/new_opencl/kmeans/libkmeans.a and /dev/null differ
diff --git a/benchmarks/new_opencl/nearn/Makefile b/benchmarks/new_opencl/nearn/Makefile
index 87f6dc48..3fbd20e0 100644
--- a/benchmarks/new_opencl/nearn/Makefile
+++ b/benchmarks/new_opencl/nearn/Makefile
@@ -1,8 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -17,7 +19,7 @@ SRCS = main.cc clutils.cpp utils.cpp
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/runtime/lib/libOpenCL.so.2.5.0 b/benchmarks/new_opencl/runtime/lib/libOpenCL.so.2.5.0
index ea1ac68b..e5f1a692 100644
Binary files a/benchmarks/new_opencl/runtime/lib/libOpenCL.so.2.5.0 and b/benchmarks/new_opencl/runtime/lib/libOpenCL.so.2.5.0 differ
diff --git a/benchmarks/new_opencl/saxpy/Makefile b/benchmarks/new_opencl/saxpy/Makefile
index 46cdd7dc..55773533 100644
--- a/benchmarks/new_opencl/saxpy/Makefile
+++ b/benchmarks/new_opencl/saxpy/Makefile
@@ -1,7 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -16,7 +19,7 @@ SRCS = main.cc
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/sfilter/Makefile b/benchmarks/new_opencl/sfilter/Makefile
index 9636752a..d1d0a41d 100644
--- a/benchmarks/new_opencl/sfilter/Makefile
+++ b/benchmarks/new_opencl/sfilter/Makefile
@@ -1,8 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -17,7 +19,7 @@ SRCS = main.cc
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/sgemm/Makefile b/benchmarks/new_opencl/sgemm/Makefile
index b23afa17..b2817ae4 100644
--- a/benchmarks/new_opencl/sgemm/Makefile
+++ b/benchmarks/new_opencl/sgemm/Makefile
@@ -1,8 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -17,7 +19,7 @@ SRCS = main.cc
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/transpose/Makefile b/benchmarks/new_opencl/transpose/Makefile
index ad0f274b..c122c176 100644
--- a/benchmarks/new_opencl/transpose/Makefile
+++ b/benchmarks/new_opencl/transpose/Makefile
@@ -1,7 +1,10 @@
-LLVM_LIB_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops/lib)
-POCLCC_PATH ?= $(wildcard ../compiler)
-POCLRT_PATH ?= $(wildcard ../runtime)
-DRIVER_PATH ?= $(wildcard ../../../driver/sw)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -16,7 +19,7 @@ SRCS = main.cc transpose_gold.cpp
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(LLVM_LIB_PATH):$(POCLCC_PATH)/lib:$(DRIVER_PATH)/simx $(POCLCC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/vecadd/Makefile b/benchmarks/new_opencl/vecadd/Makefile
index fd160cdc..145f51ea 100644
--- a/benchmarks/new_opencl/vecadd/Makefile
+++ b/benchmarks/new_opencl/vecadd/Makefile
@@ -1,8 +1,10 @@
-RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../compiler)
-POCL_RT_PATH ?= $(wildcard ../runtime)
-VORTEX_DRV_PATH ?= $(wildcard ../../../driver/sw)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
+LLVM_HOME ?= ~/dev/llvm-project/drops
+TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf
+POCL_CC_PATH ?= $(realpath ../compiler)
+POCL_RT_PATH ?= $(realpath ../runtime)
+VORTEX_DRV_PATH ?= $(realpath ../../../driver/sw)
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 
 CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
 
@@ -17,7 +19,7 @@ SRCS = main.cc
 all: $(PROJECT)
 
 kernel.pocl: kernel.cl
-	LLVM_INSTALL_PATH=$(RISCV_TOOL_PATH) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib:$(VORTEX_DRV_PATH)/simx $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
+	TOOLCHAIN_PATH=$(TOOLCHAIN_PATH) SYSROOT=$(SYSROOT) LLVM_HOME=$(LLVM_HOME) VORTEX_RUNTIME_PATH=$(VORTEX_RT_PATH) POCL_DEBUG=all LD_LIBRARY_PATH=$(LLVM_HOME)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o kernel.pocl kernel.cl
  
 $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
diff --git a/benchmarks/new_opencl/vecadd/kernel.pocl b/benchmarks/new_opencl/vecadd/kernel.pocl
index d105d4a3..904745d4 100644
Binary files a/benchmarks/new_opencl/vecadd/kernel.pocl and b/benchmarks/new_opencl/vecadd/kernel.pocl differ