[llvm-branch-commits] [libunwind] release/19.x: [libunwind] Stop installing the mach-o module map (#105616) (PR #105896)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Fri Aug 23 15:10:44 PDT 2024


https://github.com/llvmbot created https://github.com/llvm/llvm-project/pull/105896

Backport 172c4a4a147833f1c08df1555f3170aa9ccb6cbe

Requested by: @ian-twilightcoder

>From 80e7aae158205eeadd44f21c5f8baef6d2dc1b14 Mon Sep 17 00:00:00 2001
From: Ian Anderson <iana at apple.com>
Date: Thu, 22 Aug 2024 13:44:58 -0700
Subject: [PATCH] [libunwind] Stop installing the mach-o module map (#105616)

libunwind shouldn't know that compact_unwind_encoding.h is part of a
MachO module that it doesn't own. Delete the mach-o module map, and let
whatever is in charge of the mach-o directory be the one to say how its
module is organized and where compact_unwind_encoding.h fits in.

(cherry picked from commit 172c4a4a147833f1c08df1555f3170aa9ccb6cbe)
---
 libunwind/include/CMakeLists.txt                           | 1 -
 libunwind/include/mach-o/compact_unwind_encoding.modulemap | 4 ----
 2 files changed, 5 deletions(-)
 delete mode 100644 libunwind/include/mach-o/compact_unwind_encoding.modulemap

diff --git a/libunwind/include/CMakeLists.txt b/libunwind/include/CMakeLists.txt
index 51065d68afd4ea..6796d67a3354ff 100644
--- a/libunwind/include/CMakeLists.txt
+++ b/libunwind/include/CMakeLists.txt
@@ -3,7 +3,6 @@ set(files
     libunwind.h
     libunwind.modulemap
     mach-o/compact_unwind_encoding.h
-    mach-o/compact_unwind_encoding.modulemap
     unwind_arm_ehabi.h
     unwind_itanium.h
     unwind.h
diff --git a/libunwind/include/mach-o/compact_unwind_encoding.modulemap b/libunwind/include/mach-o/compact_unwind_encoding.modulemap
deleted file mode 100644
index 6eae657d31b5c5..00000000000000
--- a/libunwind/include/mach-o/compact_unwind_encoding.modulemap
+++ /dev/null
@@ -1,4 +0,0 @@
-module MachO.compact_unwind_encoding [system] {
-  header "compact_unwind_encoding.h"
-  export *
-}



More information about the llvm-branch-commits mailing list