From dfbec234dbf6700c2ba339424a74e2afb85cbfca Mon Sep 17 00:00:00 2001 From: "Yaxun (Sam) Liu" Date: Wed, 19 Aug 2020 10:47:32 -0400 Subject: [PATCH] Fix hipcc for extracing clang version On teamcity clang --version returns something like clang version 12.0.0 Target: x86_64-unknown-linux-gnu currently hipcc does not handle it correctly since [^ ] causes new line and Targe: matched. \S will make sure only version string matched. Change-Id: I3659d6daf89b709d2b001e6b8024d69d8b79efc0 [ROCm/clr commit: 5e5fb829ed7c0cb70e5036459fe9626844701fa9] --- projects/clr/hipamd/bin/hipcc | 2 +- projects/clr/hipamd/bin/hipconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc index 22fd249bfd..0e3027e03a 100755 --- a/projects/clr/hipamd/bin/hipcc +++ b/projects/clr/hipamd/bin/hipcc @@ -201,7 +201,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { } $HIP_CLANG_VERSION = `$HIPCC --version`; - $HIP_CLANG_VERSION=~/.*clang version ([^ ]+).*/; + $HIP_CLANG_VERSION=~/.*clang version (\S+).*/; $HIP_CLANG_VERSION=$1; if (! defined $HIP_CLANG_INCLUDE_PATH) { diff --git a/projects/clr/hipamd/bin/hipconfig b/projects/clr/hipamd/bin/hipconfig index 8659669f5f..b0c01796cc 100755 --- a/projects/clr/hipamd/bin/hipconfig +++ b/projects/clr/hipamd/bin/hipconfig @@ -139,7 +139,7 @@ if ($HIP_COMPILER eq "clang") { $HIP_CLANG_PATH = "$HIP_ROCCLR_HOME/bin"; } $HIP_CLANG_VERSION = `$HIP_CLANG_PATH/clang++ --version`; - $HIP_CLANG_VERSION=~/.*clang version ([^ ]+).*/; + $HIP_CLANG_VERSION=~/.*clang version (\S+).*/; $HIP_CLANG_VERSION=$1; $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -I$HIP_PATH/include -I$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION -I$HSA_PATH/include";