diff --git a/build/envsetup.sh b/build/envsetup.sh
index 6537917..65f4e6f 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -154,8 +154,11 @@
 # Enable SD-LLVM if available
 if [ -d $(gettop)/vendor/qcom/sdclang ]; then
             export SDCLANG=true
-            export SDCLANG_PATH="vendor/qcom/sdclang/4.0.2/prebuilt/linux-x86_64/bin"
+            export SDCLANG_PATH="vendor/qcom/sdclang/6.0/prebuilt/linux-x86_64/bin"
             export SDCLANG_LTO_DEFS="vendor/qcom/sdclang/sdllvm-lto-defs.mk"
             export SDCLANG_CONFIG="vendor/qcom/sdclang/sdclang.json"
             export SDCLANG_AE_CONFIG="vendor/qcom/sdclang/sdclangAE.json"
+            export SDCLANG_COMMON_FLAGS="-O3 -Wno-user-defined-warnings -Wno-vectorizer-no-neon -Wno-unknown-warning-option \
+-Wno-deprecated-register -Wno-tautological-type-limit-compare -Wno-sign-compare -Wno-gnu-folding-constant \
+-mllvm -arm-implicit-it=always -Wno-inline-asm -Wno-unused-command-line-argument -Wno-unused-variable"
 fi