[llvm] 1279b79 - [gn build] make libunwind build on macOS

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Mon May 31 10:17:34 PDT 2021


Author: Nico Weber
Date: 2021-05-31T13:17:16-04:00
New Revision: 1279b79c9bb10c15baab08a629ebc535b442af3b

URL: https://github.com/llvm/llvm-project/commit/1279b79c9bb10c15baab08a629ebc535b442af3b
DIFF: https://github.com/llvm/llvm-project/commit/1279b79c9bb10c15baab08a629ebc535b442af3b.diff

LOG: [gn build] make libunwind build on macOS

Added: 
    

Modified: 
    llvm/utils/gn/secondary/BUILD.gn
    llvm/utils/gn/secondary/libunwind/src/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/BUILD.gn b/llvm/utils/gn/secondary/BUILD.gn
index 50f1c4f26d6b..16b4c986d747 100644
--- a/llvm/utils/gn/secondary/BUILD.gn
+++ b/llvm/utils/gn/secondary/BUILD.gn
@@ -18,12 +18,14 @@ group("default") {
     deps += [
       "//libcxx",
       "//libcxxabi",
-      "//libunwind",
     ]
   }
   if (current_os == "linux" || current_os == "android") {
     deps += [ "//compiler-rt/test/hwasan" ]
   }
+  if (current_os == "linux" || current_os == "mac") {
+    deps += [ "//libunwind" ]
+  }
 
   testonly = true
 }

diff  --git a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
index c36341ca54b2..28869295c9de 100644
--- a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
@@ -84,8 +84,8 @@ if (libunwind_enable_shared) {
     }
     if (current_os == "mac") {
       ldflags += [
-        "-compatibility_version 1",
-        "-install_name /usr/lib/libunwind.1.dylib",
+        "-Wl,-compatibility_version,1",
+        "-Wl,-install_name,/usr/lib/libunwind.1.dylib",
       ]
     }
     sources = unwind_sources


        


More information about the llvm-commits mailing list