From 242779287ff78e73c3810c71b2a5847d93710900 Mon Sep 17 00:00:00 2001
From: TomSang <Tao.Sang@amd.com>
Date: Mon, 24 Jan 2022 00:45:36 -0500
Subject: [PATCH] SWDEV-319221 - Fix c++/g++ build (#2464)

CentOS 7.5 has too old c++/g++/gcc(<version 5) in /usr/bin.
They cannot support __has_attribute, thus build failure will
happen.
Remove hardcoded /usr/bin path so that the target version will
be selected via PATH. For example in CentOS,
PATH=/opt/rh/devtoolset-7/root/usr/bin:$PATH, c++/g++/gcc will
be from /opt/rh/devtoolset-7/root/usr/bin.

Change-Id: Id77c54127eb0b9960e78897af75cfc3666d85689

[ROCm/hip commit: b253a4617b84714f547937b57a5c50a8f50b431a]
---
 projects/hip/tests/hit/HIT.cmake | 4 ++--
 projects/hip/tests/hit/parser    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/hip/tests/hit/HIT.cmake b/projects/hip/tests/hit/HIT.cmake
index f831d5965f..006c9ec999 100755
--- a/projects/hip/tests/hit/HIT.cmake
+++ b/projects/hip/tests/hit/HIT.cmake
@@ -372,8 +372,8 @@ macro(HIT_ADD_FILES _config _dir _label _parent)
         string(REGEX REPLACE "%hc" "${HIP_HIPCC_EXECUTABLE}" _contents "${_contents}")
         string(REGEX REPLACE "%hip-path" "${HIP_ROOT_DIR}" _contents "${_contents}")
         string(REGEX REPLACE "%rocm-path" "${ROCM_PATH}" _contents "${_contents}")
-        string(REGEX REPLACE "%cc" "/usr/bin/cc" _contents "${_contents}")
-        string(REGEX REPLACE "%cxx" "/usr/bin/c++" _contents "${_contents}")
+        string(REGEX REPLACE "%cc" "cc" _contents "${_contents}")
+        string(REGEX REPLACE "%cxx" "c++" _contents "${_contents}")
         string(REGEX REPLACE "%S" ${_dir} _contents "${_contents}")
         string(REGEX REPLACE "%T" ${_label} _contents "${_contents}")
         foreach(_cmd ${_contents})
diff --git a/projects/hip/tests/hit/parser b/projects/hip/tests/hit/parser
index bad5e62311..b493e4f6ec 100755
--- a/projects/hip/tests/hit/parser
+++ b/projects/hip/tests/hit/parser
@@ -67,7 +67,7 @@ sub parse_file {
                 $line =~ s/%s/$file/g;          # Substitute %s -> filename
                 $line =~ s/%t/$exe/g;           # Substitute %t -> targetname
                 # Substitute %hc -> /path/to/hipcc and %hip-path -> /path/to/hip happens in cmake
-                # Substitute %cc -> /usr/bin/cc and %cxx -> /usr/bin/c++ happens in cmake
+                # Substitute %cc -> cc and %cxx -> c++ happens in cmake
                 # Substitute %S -> src dir and %T -> target build dir happens in cmake
                 $line =~ s/\R//g;               # Remove line endings
                 push @customBuildCMDs, $line;