From 08324ab9eb97535b5994450186c5048be3c0cd62 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 8 Apr 2023 12:47:27 +0900 Subject: Include `--no-llvm-bc` option in `NM` macro only if usable --- tool/darwin-ar | 1 + tool/leaked-globals | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'tool') diff --git a/tool/darwin-ar b/tool/darwin-ar index 6f2a6ca2ad..8b25425cfe 100755 --- a/tool/darwin-ar +++ b/tool/darwin-ar @@ -1,4 +1,5 @@ #!/bin/bash +export LANG=C LC_ALL=C # Suppress localication exec 2> >(exec grep -v \ -e ' no symbols$' \ >&2) diff --git a/tool/leaked-globals b/tool/leaked-globals index 136d96b6ab..e079b0efc5 100755 --- a/tool/leaked-globals +++ b/tool/leaked-globals @@ -19,10 +19,6 @@ config = ARGV.shift count = 0 col = Colorize.new -# nm errors with Rust's LLVM bitcode when Rust uses a newer LLVM version than nm. -# In case we're working with llvm-nm, tell it to not worry about the bitcode. -no_llvm = "--no-llvm-bc" if `#{NM} --version` =~ /llvm/i - config_code = File.read(config) REPLACE = config_code.scan(/\bAC_(?:REPLACE|CHECK)_FUNCS?\((\w+)/).flatten # REPLACE << 'memcmp' if /\bAC_FUNC_MEMCMP\b/ =~ config_code @@ -54,7 +50,7 @@ REPLACE.push("rust_eh_personality") if RUBY_PLATFORM.include?("darwin") print "Checking leaked global symbols..." STDOUT.flush -IO.foreach("|#{NM} #{no_llvm} #{ARGV.join(' ')}") do |line| +IO.foreach("|#{NM} #{ARGV.join(' ')}") do |line| n, t, = line.split next unless /[A-TV-Z]/ =~ t next unless n.sub!(/^#{SYMBOL_PREFIX}/o, "") -- cgit v1.2.1