[llvm] r349992 - [gn build] Embed __TEXT __info_plist section into clang binary on macOS

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 21 19:51:10 PST 2018


Author: nico
Date: Fri Dec 21 19:51:10 2018
New Revision: 349992

URL: http://llvm.org/viewvc/llvm-project?rev=349992&view=rev
Log:
[gn build] Embed __TEXT __info_plist section into clang binary on macOS

Verified by comparing the output of `otool -P bin/clang` between the GN and the
CMake build.

Differential Revision: https://reviews.llvm.org/D55984

Modified:
    llvm/trunk/utils/gn/secondary/clang/tools/driver/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/clang/tools/driver/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/clang/tools/driver/BUILD.gn?rev=349992&r1=349991&r2=349992&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/clang/tools/driver/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/clang/tools/driver/BUILD.gn Fri Dec 21 19:51:10 2018
@@ -1,4 +1,5 @@
 import("//llvm/utils/gn/build/symlink_or_copy.gni")
+import("//llvm/version.gni")
 
 symlinks = [
   # target_name, symlink_target pairs: GN doesn't support '+' in rule names.
@@ -33,6 +34,29 @@ group("symlinks") {
   }
 }
 
+if (host_os == "mac") {
+  action("write_info_plist") {
+    script = "//llvm/utils/gn/build/write_cmake_config.py"
+    sources = [
+      "Info.plist.in",
+    ]
+    outputs = [
+      "$target_gen_dir/Info.plist",
+    ]
+
+    args = [
+      "-o",
+      rebase_path(outputs[0], root_out_dir),
+      rebase_path(sources[0], root_out_dir),
+
+      "TOOL_INFO_BUILD_VERSION=$llvm_version_major.$llvm_version_minor",
+      "TOOL_INFO_NAME=clang",
+      "TOOL_INFO_UTI=org.llvm.clang",
+      "TOOL_INFO_VERSION=$llvm_version",
+    ]
+  }
+}
+
 executable("clang") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
@@ -61,12 +85,16 @@ executable("clang") {
     "//llvm/lib/Transforms/Utils",
     "//llvm/lib/Transforms/Vectorize",
   ]
+  if (host_os == "mac") {
+    deps += [ ":write_info_plist" ]
+    plist = get_target_outputs(":write_info_plist")
+    ldflags = [ "-Wl,-sectcreate,__TEXT,__info_plist," +
+                rebase_path(plist[0], root_out_dir) ]
+  }
   sources = [
     "cc1_main.cpp",
     "cc1as_main.cpp",
     "cc1gen_reproducer_main.cpp",
     "driver.cpp",
   ]
-
-  # FIXME: Info.plist embedding for mac builds.
 }




More information about the llvm-commits mailing list