diff --git a/bin/hipcc b/bin/hipcc
index 03f35b27fc..1be33d55e1 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -115,8 +115,13 @@ if ($HIP_PLATFORM eq "clang") {
     $ROCM_PATH=$ENV{'ROCM_PATH'} // "/opt/rocm";
     $HIPCC="$HIP_CLANG_PATH/clang++";
     $HIPCXXFLAGS .= "-std=c++11 -I$HIP_PATH/include";
-
     $HIPLDFLAGS = "--hip-link --hip-device-lib-path=$DEVICE_LIB_PATH -L$HIP_PATH/lib -lhip_hcc";
+
+    # If $HIPCC clang++ is not compiled, use clang instead
+    if ( ! -e $HIPCC ) {
+        $HIPCC="$HIP_CLANG_PATH/clang";
+        $HIPLDFLAGS = "--driver-mode=g++ " . $HIPLDFLAGS;
+    }
 } elsif ($HIP_PLATFORM eq "hcc") {
     $HSA_PATH=$ENV{'HSA_PATH'} // "/opt/rocm/hsa";