diff --git a/make/profiler-defs.mk b/make/profiler-defs.mk
index 1c72e05a..6267368b 100644
--- a/make/profiler-defs.mk
+++ b/make/profiler-defs.mk
@@ -3,7 +3,7 @@ clean:
 
 PROF_EXE_PATH          ?= $(EXE_PATH)
 CALLGRIND_OUT          ?= callgrind.out
-OPROF_OUT_DIR          ?= oprofile-dir
+OPROF_OUT_DIR          ?= oprofile-data
 
 ifeq ($(USE_GPROF),true)
   PROJECT_CPPFLAGS     += -pg
@@ -19,3 +19,10 @@ ifeq ($(USE_GCOV),true)
 clean: clean.gcov
 endif
 
+ifeq ($(COMPILER_SUITE),clang)
+  ifeq ($(USE_XRAY),true)
+    PROJECT_CPPFLAGS     += -fxray-instrument -fxray-instruction-threshold=1
+    PROJECT_CFLAGS       += -fxray-instrument -fxray-instruction-threshold=1
+    #PROJECT_LDFLAGS      += -fxray-instrument
+  endif
+endif