bazel/clang: Fix for setup script (envoyproxy#36002)

Signed-off-by: Ryan Northey <[email protected]>
fredyw · Sep 6, 2024 · 27e4a8d · 27e4a8d
1 parent a4058c3
commit 27e4a8d
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/bazel/setup_clang.sh b/bazel/setup_clang.sh
@@ -5,23 +5,25 @@ set -e
 BAZELRC_FILE="${BAZELRC_FILE:-./clang.bazelrc}"
 
 LLVM_PREFIX=$1
+LLVM_CONFIG="${LLVM_PREFIX}/bin/llvm-config"
 
-if [[ ! -e "${LLVM_PREFIX}/bin/llvm-config" ]]; then
+if [[ ! -e "${LLVM_CONFIG}" ]]; then
   echo "Error: cannot find local llvm-config in ${LLVM_PREFIX}."
   exit 1
 fi
 
-LLVM_VERSION="$(llvm-config --version)"
-LLVM_LIBDIR="$(llvm-config --libdir)"
-LLVM_TARGET="$(llvm-config --host-target)"
+LLVM_VERSION="$("${LLVM_CONFIG}" --version)"
+LLVM_LIBDIR="$("${LLVM_CONFIG}" --libdir)"
+LLVM_TARGET="$("${LLVM_CONFIG}" --host-target)"
 
 RT_LIBRARY_PATH="${LLVM_LIBDIR}/clang/${LLVM_VERSION}/lib/${LLVM_TARGET}"
 
-echo "# Generated file, do not edit. If you want to disable clang, just delete this file.
-build:clang --action_env='LLVM_CONFIG=${LLVM_PREFIX}/bin/llvm-config' --host_action_env='LLVM_CONFIG=${LLVM_PREFIX}/bin/llvm-config'
-build:clang --repo_env='LLVM_CONFIG=${LLVM_PREFIX}/bin/llvm-config'
-build:clang --linkopt='-L$(llvm-config --libdir)'
-build:clang --linkopt='-Wl,-rpath,$(llvm-config --libdir)'
+cat <<EOF > "${BAZELRC_FILE}"
+# Generated file, do not edit. If you want to disable clang, just delete this file.
+build:clang --action_env=LLVM_CONFIG=${LLVM_CONFIG} --host_action_env=LLVM_CONFIG=${LLVM_CONFIG}
+build:clang --repo_env=LLVM_CONFIG=${LLVM_CONFIG}
+build:clang --linkopt=-L${LLVM_LIBDIR}
+build:clang --linkopt=-Wl,-rpath,${LLVM_LIBDIR}
 
-build:clang-asan --linkopt='-L${RT_LIBRARY_PATH}'
-" >"${BAZELRC_FILE}"
+build:clang-asan --linkopt=-L${RT_LIBRARY_PATH}
+EOF