From 92a468a647a807d3c6464f4655e0fad13494cac5 Mon Sep 17 00:00:00 2001 From: Aaron Enye Shi Date: Wed, 7 Aug 2019 16:59:17 -0400 Subject: [PATCH] Fix HIP-VDI using incorrect include files When HIP-VDI depends on an llvm-amdgpu package, the include clang directory is not properly assessed. [ROCm/clr commit: 3750b2cf42cd103589aaac102bb688af7e004798] --- projects/clr/hipamd/bin/hipcc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/clr/hipamd/bin/hipcc b/projects/clr/hipamd/bin/hipcc index 1eda99b936..e51d9dde09 100755 --- a/projects/clr/hipamd/bin/hipcc +++ b/projects/clr/hipamd/bin/hipcc @@ -118,10 +118,10 @@ if ($HIP_RUNTIME eq "VDI" and !defined $HIP_VDI_HOME) { if (defined $HIP_VDI_HOME) { if (!defined $HIP_CLANG_PATH and (-e "$HIP_VDI_HOME/bin/clang" or -e "$HIP_VDI_HOME/bin/clang.exe")) { $HIP_CLANG_PATH = "$HIP_VDI_HOME/bin"; - } - # With HIP_VDI_HOME defined, assume the installation of clang components, including headers. - if (!defined $HIP_CLANG_INCLUDE_PATH) { - $HIP_CLANG_INCLUDE_PATH = "$HIP_VDI_HOME/include/clang"; + # With HIP_VDI_HOME defined, assume the installation of clang components, including headers. + if (!defined $HIP_CLANG_INCLUDE_PATH) { + $HIP_CLANG_INCLUDE_PATH = "$HIP_VDI_HOME/include/clang"; + } } if (!defined $DEVICE_LIB_PATH and -e "$HIP_VDI_HOME/lib/bitcode") { $DEVICE_LIB_PATH = "$HIP_VDI_HOME/lib/bitcode";