[llvm] r374129 - gn build: unbreak libcxx build after r374116 by restoring gen_link_script.py for gn

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Tue Oct 8 16:08:19 PDT 2019


Author: nico
Date: Tue Oct  8 16:08:18 2019
New Revision: 374129

URL: http://llvm.org/viewvc/llvm-project?rev=374129&view=rev
Log:
gn build: unbreak libcxx build after r374116 by restoring gen_link_script.py for gn

Added:
    llvm/trunk/utils/gn/secondary/libcxx/utils/
    llvm/trunk/utils/gn/secondary/libcxx/utils/gen_link_script.py   (with props)
Modified:
    llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn?rev=374129&r1=374128&r2=374129&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/libcxx/src/BUILD.gn Tue Oct  8 16:08:18 2019
@@ -230,7 +230,7 @@ if (libcxx_enable_shared) {
 
   if (libcxx_enable_abi_linker_script) {
     action("cxx_linker_script") {
-      script = "//libcxx/utils/gen_link_script.py"
+      script = "//llvm/utils/gn/secondary/libcxx/utils/gen_link_script.py"
       outputs = [
         "$runtimes_dir/libc++.so",
       ]

Added: llvm/trunk/utils/gn/secondary/libcxx/utils/gen_link_script.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/libcxx/utils/gen_link_script.py?rev=374129&view=auto
==============================================================================
--- llvm/trunk/utils/gn/secondary/libcxx/utils/gen_link_script.py (added)
+++ llvm/trunk/utils/gn/secondary/libcxx/utils/gen_link_script.py Tue Oct  8 16:08:18 2019
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+#===----------------------------------------------------------------------===##
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+#===----------------------------------------------------------------------===##
+
+"""
+Generate a linker script that links libc++ to the proper ABI library.
+An example script for c++abi would look like "INPUT(libc++.so.1 -lc++abi)".
+"""
+
+import argparse
+import os
+import sys
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--input", help="Path to libc++ library", required=True)
+    parser.add_argument("--output", help="Path to libc++ linker script",
+                        required=True)
+    parser.add_argument("libraries", nargs="+",
+                        help="List of libraries libc++ depends on")
+    args = parser.parse_args()
+
+    # Use the relative path for the libc++ library.
+    libcxx = os.path.relpath(args.input, os.path.dirname(args.output))
+
+    # Prepare the list of public libraries to link.
+    public_libs = ['-l%s' % l for l in args.libraries]
+
+    # Generate the linker script contents.
+    contents = "INPUT(%s)" % ' '.join([libcxx] + public_libs)
+
+    # Remove the existing libc++ symlink if it exists.
+    if os.path.islink(args.output):
+        os.unlink(args.output)
+
+    # Replace it with the linker script.
+    with open(args.output, 'w') as f:
+        f.write(contents + "\n")
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())

Propchange: llvm/trunk/utils/gn/secondary/libcxx/utils/gen_link_script.py
------------------------------------------------------------------------------
    svn:executable = *




More information about the llvm-commits mailing list