update clang installation

nervosys · Apr 24, 2024 · 6f0b4ba · 6f0b4ba
1 parent 2b3a966
commit 6f0b4ba
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -131,12 +131,14 @@ if [ "$(uname)" = 'Darwin' ]; then
     # brew install azure-cli
 else
     echo 'Installing dependencies...'
+    sudo add-apt-repository -y ppa:graphics-drivers/ppa
+    sudo apt-get update -y
     wget https://apt.llvm.org/llvm.sh
     chmod +x llvm.sh
     sudo ./llvm.sh "$CLANG_VERSION"
-    #wget -qO- 'https://apt.llvm.org/llvm-snapshot.gpg.key' | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-    sudo add-apt-repository -y ppa:graphics-drivers/ppa
-    sudo apt-get update -y
+    sudo apt-get install -y "libc++-${CLANG_VERSION}-dev" "libc++abi-${CLANG_VERSION}-dev"
+    sudo apt-get install -y "gcc-${GCC_VERSION}"
+    #wget -qO- 'https://apt.llvm.org/llvm-snapshot.gpg.key' | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc    
     sudo apt-get install -y --no-install-recommends \
         apt-transport-https \
         ca-certificates \
@@ -153,13 +155,6 @@ else
         vulkan-tools \
         libvulkan1 \
         # vulkan vulkan-utils
-    sudo apt-get install -y \
-        "gcc-${GCC_VERSION}" \
-        #"clang-${CLANG_VERSION}" \
-        #"lldb-${CLANG_VERSION}" \
-        #"lld-${CLANG_VERSION}" \
-        "libc++-${CLANG_VERSION}-dev" \
-        "libc++abi-${CLANG_VERSION}-dev" 
 fi
 
 # Get/set CMake version.