diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt
index 563c591bde..34a2af95d0 100644
--- a/projects/clr/opencl/CMakeLists.txt
+++ b/projects/clr/opencl/CMakeLists.txt
@@ -17,6 +17,11 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
 option(BUILD_SHARED_LIBS "Build shared libs" ON)
 
+option(ADDRESS_SANITIZER "Build Address Sanitizer" OFF)
+if (ADDRESS_SANITIZER)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+endif()
+
 #set a name for icd file
 set(OPENCL_AMD_ICD_FILE "amdocl64.icd")
 if (DEFINED ROCM_PATCH_VERSION)
diff --git a/projects/clr/opencl/tools/cltrace/CMakeLists.txt b/projects/clr/opencl/tools/cltrace/CMakeLists.txt
index ec867f2219..992bdfd568 100644
--- a/projects/clr/opencl/tools/cltrace/CMakeLists.txt
+++ b/projects/clr/opencl/tools/cltrace/CMakeLists.txt
@@ -5,6 +5,10 @@ endif()
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/cltrace.map")
 
+if (ADDRESS_SANITIZER)
+  set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared-libasan")
+endif()
+
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../../)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../../khronos/headers/opencl2.2)