[PATCH] D137611: cmake: Inline the add_llvm_symbol_exports.py script

[Tom Stellard via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGa7ba84a39dbe: cmake: Inline the add_llvm_symbol_exports.py script (authored by tstellar).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D137611/new/

https://reviews.llvm.org/D137611

Files:
  llvm/cmake/modules/AddLLVM.cmake
  llvm/utils/add_llvm_symbol_exports.py


Index: llvm/utils/add_llvm_symbol_exports.py
===================================================================
--- llvm/utils/add_llvm_symbol_exports.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-#===----------------------------------------------------------------------===##
-#
-# 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
-#
-#===----------------------------------------------------------------------===##
-
-import os
-import sys
-
-if (len(sys.argv) != 4):
-    print('usage: ' + sys.argv[0] + ' <LLVM major version> <input> <output>')
-    sys.exit(1)
-
-with open(sys.argv[3], 'w') as out_fd:
-    out_fd.write('LLVM_' + sys.argv[1] + ' {\n')
-    if os.stat(sys.argv[2]).st_size > 0:
-        out_fd.write('  global:\n')
-        with open(sys.argv[2], 'r') as in_fd:
-            for e in in_fd.readlines():
-                out_fd.write('    ' + e.rstrip() + ';\n')
-    out_fd.write('  local: *;\n};\n')
-
-sys.exit(0)
Index: llvm/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/cmake/modules/AddLLVM.cmake
+++ llvm/cmake/modules/AddLLVM.cmake
@@ -103,7 +103,13 @@
     # FIXME: Don't write the "local:" line on OpenBSD.
     # in the export file, also add a linker script to version LLVM symbols (form: LLVM_N.M)
     add_custom_command(OUTPUT ${native_export_file}
-      COMMAND "${Python3_EXECUTABLE}" ${LLVM_MAIN_SRC_DIR}/utils/add_llvm_symbol_exports.py ${LLVM_VERSION_MAJOR} ${export_file} ${native_export_file}
+      COMMAND "${Python3_EXECUTABLE}" "-c"
+      "import sys; \
+       lines = ['    ' + l.rstrip() for l in sys.stdin] + ['  local: *;']; \
+       print('LLVM_${LLVM_VERSION_MAJOR} {'); \
+       print('  global:') if len(lines) > 1 else None; \
+       print(';\\n'.join(lines) + '\\n};')"
+      < ${export_file} > ${native_export_file}
       DEPENDS ${export_file}
       VERBATIM
       COMMENT "Creating export file for ${target_name}")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D137611.474600.patch
Type: text/x-patch
Size: 2105 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221110/e7126ee8/attachment.bin>