From 70292829f302c709d013096bc2cdc996ab92a467 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Fri, 2 Apr 2021 10:58:01 -0700 Subject: [PATCH] Cache glibc.system_version --- Library/Homebrew/os/linux/glibc.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/os/linux/glibc.rb b/Library/Homebrew/os/linux/glibc.rb index 360ea0cd65..2d27c1cca1 100644 --- a/Library/Homebrew/os/linux/glibc.rb +++ b/Library/Homebrew/os/linux/glibc.rb @@ -12,23 +12,25 @@ module OS module_function def system_version - return @system_version if @system_version - - version = Utils.popen_read("/usr/bin/ldd", "--version")[/ (\d+\.\d+)/, 1] - return Version::NULL unless version - - @system_version = Version.new version + @system_version ||= begin + version = Utils.popen_read("/usr/bin/ldd", "--version")[/ (\d+\.\d+)/, 1] + if version + Version.new version + else + Version::NULL + end + end end def version @version ||= begin - ldd = HOMEBREW_PREFIX/"opt/glibc/bin/ldd" - version = Utils.popen_read(ldd, "--version")[/ (\d+\.\d+)/, 1] if ldd.executable? + version = Utils.popen_read(HOMEBREW_PREFIX/"opt/glibc/bin/ldd", "--version")[/ (\d+\.\d+)/, 1] if version Version.new version else system_version end + end end sig { returns(Version) }