From dcac5b89f2549c66035569a77def37bb7c61af3f Mon Sep 17 00:00:00 2001
From: Andrew Phelps <anphel31@users.noreply.github.com>
Date: Fri, 26 Jul 2024 09:50:41 -0700
Subject: [PATCH] compiler-rt: fix path issue (#9937)

---
 SPECS/compiler-rt/compiler-rt.spec | 15 +++++++++------
 cgmanifest.json                    | 10 ----------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/SPECS/compiler-rt/compiler-rt.spec b/SPECS/compiler-rt/compiler-rt.spec
index d90f36da358..616ee8ce0bb 100644
--- a/SPECS/compiler-rt/compiler-rt.spec
+++ b/SPECS/compiler-rt/compiler-rt.spec
@@ -1,11 +1,11 @@
-%global maj_ver %(echo %{version} | cut -d. -f1)
+%global maj_ver 18
 
 %global compiler_rt_srcdir llvm-project-llvmorg-%{version}
 
 Summary:        LLVM compiler support routines
 Name:           compiler-rt
 Version:        18.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        Apache 2.0 WITH exceptions
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -30,9 +30,10 @@ BlocksRuntime is an implementation of Apple "blocks" interface.
 %build
 mkdir -p build
 cd build
-%cmake -DCMAKE_BUILD_TYPE=Release  \
-	-DCOMPILER_RT_INSTALL_PATH=%{_prefix}/lib/clang/%{maj_ver} \
-       -Wno-dev ../compiler-rt
+%cmake \
+        -DCMAKE_BUILD_TYPE=Release  \
+        -DCOMPILER_RT_INSTALL_PATH=%{_prefix}/lib/clang/%{maj_ver} \
+        -Wno-dev ../compiler-rt
 
 %make_build
 
@@ -43,13 +44,15 @@ cd build
 %files
 %defattr(-,root,root)
 %license LICENSE.TXT
-
 %{_libdir}/clang/%{maj_ver}/bin/*
 %{_libdir}/clang/%{maj_ver}/include/*
 %{_libdir}/clang/%{maj_ver}/lib/*
 %{_libdir}/clang/%{maj_ver}/share/*
 
 %changelog
+* Thu Jul 25 2024 Andrew Phelps <anphel@microsoft.com> - 18.1.2-3
+- Fix installation path
+
 * Wed May 29 2024 Neha Agarwal <nehaagarwal@microsoft.com> - 18.1.2-2
 - Bump release to build with new llvm to fix CVE-2024-31852
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 4b8b7f90923..bc81075cb7c 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -10356,16 +10356,6 @@
         }
       }
     },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "libomp",
-          "version": "10.0.1",
-          "downloadUrl": "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz"
-        }
-      }
-    },
     {
       "component": {
         "type": "other",