From 56248d109689d9c35ad5ba42365f62ae37b10b68 Mon Sep 17 00:00:00 2001
From: Nicholas Magill <nmagill1979@gmail.com>
Date: Fri, 7 Jul 2023 23:49:02 +0100
Subject: [PATCH] odin: Compile kernel with Clang 17.0.2

* The issue with hard-coded paths for AR and LD
  has been resolved, drop unneccesary build flags
---
 BoardConfig.mk | 5 +----
 vendorsetup.sh | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 92ad0196..3a90084a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -130,12 +130,9 @@ BOARD_KERNEL_TAGS_OFFSET := 0x00000100
 BOARD_RAMDISK_OFFSET := 0x01000000
 
 TARGET_KERNEL_ADDITIONAL_FLAGS := DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc LLVM=1 LLVM_IAS=1
-TARGET_KERNEL_ADDITIONAL_FLAGS += AR=$(shell pwd)/prebuilts/clang/host/linux-x86/clang-r487747/bin/llvm-ar
-TARGET_KERNEL_ADDITIONAL_FLAGS += LD=$(shell pwd)/prebuilts/clang/host/linux-x86/clang-r487747/bin/ld.lld
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_CLANG_COMPILE := true
-TARGET_KERNEL_CLANG_VERSION := r487747
-TARGET_KERNEL_LLVM_BINUTILS := false
+TARGET_KERNEL_CLANG_VERSION := r487747c
 TARGET_KERNEL_CONFIG := odin_defconfig
 TARGET_KERNEL_SOURCE := kernel/xiaomi/odin
 BOARD_KERNEL_CMDLINE += androidboot.console=ttyMSM0
diff --git a/vendorsetup.sh b/vendorsetup.sh
index a927a26f..4b03b565 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,9 +1,9 @@
 CLANGDIR=$PWD/prebuilts/clang/host/linux-x86
-CLANGVER=clang-r487747
+CLANGVER=clang-r487747c
 if [ ! -d "${CLANGDIR}/${CLANGVER}" ]
 then
     GREEN='\033[0;32m'
     NC='\033[0m'
-    echo -e "${GREEN}Downloading clang 17.0${NC}"
-    git clone https://gitlab.com/inkypen/prebuilts_clang_host_linux-x86 -b ${CLANGVER} "${CLANGDIR}/${CLANGVER}"
+    echo -e "${GREEN}Downloading clang 17.0.2${NC}"
+    git clone https://gitlab.com/inkypen/prebuilts_clang_host_linux-x86 -b ${CLANGVER} "${CLANGDIR}/${CLANGVER}" --single-branch
 fi