diff --git a/clients/rider/CMakeLists.txt b/clients/rider/CMakeLists.txt
index 0defcbd2..d724728f 100644
--- a/clients/rider/CMakeLists.txt
+++ b/clients/rider/CMakeLists.txt
@@ -86,7 +86,7 @@ endif( )
 if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
   # Remove following when hcc is fixed; hcc emits following spurious warning ROCm v1.6.1
   # "clang-5.0: warning: argument unused during compilation: '-isystem /opt/rocm/include'"
-  target_compile_options( rocfft-rider PRIVATE -Wno-unused-command-line-argument )
+  target_compile_options( rocfft-rider PRIVATE -Wno-unused-command-line-argument -hc)
 
   # foreach( target ${AMDGPU_TARGETS} )
   #   target_link_libraries( rocfft-rider PRIVATE --amdgpu-target=${target} )
diff --git a/clients/samples/fixed-16/CMakeLists.txt b/clients/samples/fixed-16/CMakeLists.txt
index 84de64b0..cb2e0a52 100644
--- a/clients/samples/fixed-16/CMakeLists.txt
+++ b/clients/samples/fixed-16/CMakeLists.txt
@@ -66,7 +66,7 @@ foreach( sample ${sample_list} )
   if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
     # Remove following when hcc is fixed; hcc emits following spurious warning ROCm v1.6.1
     # "clang-5.0: warning: argument unused during compilation: '-isystem /opt/rocm/include'"
-    target_compile_options( ${sample} PRIVATE -Wno-unused-command-line-argument )
+    target_compile_options( ${sample} PRIVATE -Wno-unused-command-line-argument -hc)
 
     # foreach( target ${AMDGPU_TARGETS} )
     #   target_link_libraries( ${sample} PRIVATE --amdgpu-target=${target} )
diff --git a/clients/samples/fixed-large/CMakeLists.txt b/clients/samples/fixed-large/CMakeLists.txt
index 0a67bd0b..98eea2d1 100644
--- a/clients/samples/fixed-large/CMakeLists.txt
+++ b/clients/samples/fixed-large/CMakeLists.txt
@@ -67,7 +67,7 @@ foreach( sample ${sample_list} )
   if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
     # Remove following when hcc is fixed; hcc emits following spurious warning ROCm v1.6.1
     # "clang-5.0: warning: argument unused during compilation: '-isystem /opt/rocm/include'"
-    target_compile_options( ${sample} PRIVATE -Wno-unused-command-line-argument )
+    target_compile_options( ${sample} PRIVATE -Wno-unused-command-line-argument -hc)
 
     # foreach( target ${AMDGPU_TARGETS} )
     #   target_link_libraries( ${sample} PRIVATE --amdgpu-target=${target} )
diff --git a/clients/samples/hipfft/CMakeLists.txt b/clients/samples/hipfft/CMakeLists.txt
index 0b560c75..fe8843f8 100644
--- a/clients/samples/hipfft/CMakeLists.txt
+++ b/clients/samples/hipfft/CMakeLists.txt
@@ -28,9 +28,6 @@ find_package(rocfft)
 set( sample_list hipfft_1d_z2z hipfft_1d_d2z hipfft_2d_z2z hipfft_2d_d2z hipfft_3d_z2z
   hipfft_3d_d2z hipfft_planmany_2d_z2z hipfft_planmany_2d_r2c hipfft_setworkarea)
 
-
-set(CMAKE_CXX_FLAG = "${CMAKE_CXX_FLAG} -hc")
-
 foreach( sample ${sample_list} )
 
   add_executable( ${sample} ${sample}.cpp )
@@ -61,7 +58,7 @@ foreach( sample ${sample_list} )
   if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
     # Remove following when hcc is fixed; hcc emits following spurious warning ROCm v1.6.1
     # "clang-5.0: warning: argument unused during compilation: '-isystem /opt/rocm/include'"
-    target_compile_options( ${sample} PRIVATE -Wno-unused-command-line-argument )
+    target_compile_options( ${sample} PRIVATE -Wno-unused-command-line-argument -hc)
 
     # foreach( target ${AMDGPU_TARGETS} )
     #   target_link_libraries( ${sample} PRIVATE --amdgpu-target=${target} )
diff --git a/clients/selftest/CMakeLists.txt b/clients/selftest/CMakeLists.txt
index e4a8b451..8216da02 100644
--- a/clients/selftest/CMakeLists.txt
+++ b/clients/selftest/CMakeLists.txt
@@ -85,7 +85,7 @@ endif( )
 if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
   # Remove following when hcc is fixed; hcc emits following spurious warning ROCm v1.6.1
   # "clang-5.0: warning: argument unused during compilation: '-isystem /opt/rocm/include'"
-  target_compile_options( rocfft-selftest PRIVATE -Wno-unused-command-line-argument )
+  target_compile_options( rocfft-selftest PRIVATE -Wno-unused-command-line-argument -hc)
 
   # foreach( target ${AMDGPU_TARGETS} )
   #   target_link_libraries( rocfft-selftest PRIVATE --amdgpu-target=${target} )
diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt
index 6a2b6d0d..96bf00ad 100644
--- a/clients/tests/CMakeLists.txt
+++ b/clients/tests/CMakeLists.txt
@@ -107,7 +107,7 @@ endif( )
 if( CMAKE_CXX_COMPILER MATCHES ".*/hcc$" )
   # Remove following when hcc is fixed; hcc emits following spurious warning ROCm v1.6.1
   # "clang-5.0: warning: argument unused during compilation: '-isystem /opt/rocm/include'"
-  target_compile_options( rocfft-test PRIVATE -Wno-unused-command-line-argument )
+  target_compile_options( rocfft-test PRIVATE -Wno-unused-command-line-argument -hc)
 
   # foreach( target ${AMDGPU_TARGETS} )
   #   target_link_libraries( rocfft-test PRIVATE --amdgpu-target=${target} )