diff --git a/repos/mml/src/app/blinktree/target.mk b/repos/mml/src/app/blinktree/target.mk
index 06ea86154a..0ec6534eb6 100644
--- a/repos/mml/src/app/blinktree/target.mk
+++ b/repos/mml/src/app/blinktree/target.mk
@@ -1,4 +1,5 @@
 MXINC_DIR=$(REP_DIR)/src/app/blinktree
+GENODE_GCC_TOOLCHAIN_DIR ?= /usr/local/genode/tool/21.05
 
 TARGET = blinktree
 # soure file for benchmark framework
@@ -11,6 +12,12 @@ SRC_BTREE += blinktree_benchmark/main.cpp
 SRC_BTREE += blinktree_benchmark/benchmark.cpp
 
 SRC_CC = ${SRC_MXBENCH} ${SRC_BTREE}
-LIBS += base libc stdcxx mxtasking     
-CC_OPT += -Wno-error -fno-aligned-new -I$(MXINC_DIR)
+LIBS += base libc stdcxx mxtasking 
+EXT_OBJECTS += /usr/local/genode/tool/lib/clang/14.0.5/lib/linux/libclang_rt.builtins-x86_64.a /usr/local/genode/tool/lib/libatomic.a 
+CUSTOM_CC = /usr/local/genode/tool/bin/clang
+CUSTOM_CXX = /usr/local/genode/tool/bin/clang++
+CC_OPT += --target=x86_64-genode --sysroot=/does/not/exist --gcc-toolchain=$(GENODE_GCC_TOOLCHAIN_DIR) -Wno-error -O2 -g -fno-aligned-new -DNDEBUG -I$(MXINC_DIR) -std=c++17 #-D_GLIBCXX_ATOMIC_BUILTINS_8 -D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
+CC_OPT +=  -femulated-tls -DCLANG_CXX11_ATOMICS
 CC_CXX_WARN_STRICT =
+CUSTOM_CXX_LIB := $(CROSS_DEV_PREFIX)g++
+#CXX_LD += $(CROSS_DEV_PREFIX)g++