[clang][VE] Change to use only use major version in resource dir

[kaz7]

Summary

VE's makefile needs to know resource directory in order to compile crt-ve
correctly. The path of resource directory is changed at e1b88c8. So, we
need to correct our definition of resource directory in makefile.

This problem, not working top-level CMake with VE, will be fixed once
https://reviews.llvm.org/D89492 is merged.

[gkistanova]

Adding Simon as a reviewer.

Thanks for the patch, Marukawa-san!

It looks good at a quick glance. But please wait for Simon's approval before committing.

[simoll]

LGTM. I am no longer the maintainer of the VE bot, though.

[kaz7]

Hi Galina-san, Simon-san,

Simon and me were the maintainer of the VE and VE bot. But, Simon left us a year ago, so I'm the last member of the VE and VE bot now. VE bot haven't shown any problems, so this is my first action as a VE bot maintainer.

When I've tried to modify upstream/main with this patch, I've noticed than't I have no permission to write zorg. It's the reason why I send this patch for review.

So, @gkistanova -san, please land this patch. Thank you.

zorg/buildbot/builders/annotated/ve-linux-steps.make

 LLVM_PREFIX="${BUILDROOT}/install"
 
 # Install prefix structure
 BUILT_CLANG="${INTREE_PREFIX}/bin/clang"
 BUILT_CLANGXX="${INTREE_PREFIX}/bin/clang++"
 VE_TARGET="ve-unknown-linux-gnu"
 LINUX_VE_LIBSUFFIX=/linux/ve
 
-# Resource dir (Requires clang to be installed before this variable gets expanded)
-RES_VERSION=$(shell ${INTREE_PREFIX}/bin/llvm-config  --version | sed -n 's/git//p')
+# Resource dir
+RES_VERSION=$(shell grep 'set.*LLVM_VERSION_MAJOR  *' ${MONOREPO}/llvm/CMakeLists.txt | sed -e 's/.*LLVM_VERSION_MAJOR //' -e 's/[^0-9][^0-9]*//')
 CLANG_RESDIR="${INTREE_PREFIX}/lib/clang/${RES_VERSION}"
 
 ### LLVM
 LLVM_BUILD_TYPE=RelWithDebInfo
 
 ### Compiler-RT
 CRT_BUILD_TYPE=Release
 CRT_OPTFLAGS=-O2