From 65bc39f952d5542e620d1711dd2337913c890f7a Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Thu, 26 Nov 2020 11:53:31 -0800 Subject: [PATCH] HOMEBREW_PATCHELF_RB_WRITE: Move logic to test-bot --- Library/Homebrew/dev-cmd/bottle.rb | 2 -- Library/Homebrew/os/linux/elf.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index 07525589c6..45fba5500e 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -84,8 +84,6 @@ module Homebrew end def bottle - ENV["HOMEBREW_NO_PATCHELF_RB_WRITE"] = "1" unless ENV["HOMEBREW_PATCHELF_RB_WRITE"].present? - args = bottle_args.parse return merge(args: args) if args.merge? diff --git a/Library/Homebrew/os/linux/elf.rb b/Library/Homebrew/os/linux/elf.rb index eafd25b41e..e8009af519 100644 --- a/Library/Homebrew/os/linux/elf.rb +++ b/Library/Homebrew/os/linux/elf.rb @@ -101,7 +101,7 @@ module ELFShim def patch!(interpreter: nil, rpath: nil) return if interpreter.blank? && rpath.blank? - if HOMEBREW_PATCHELF_RB_WRITE && ENV["HOMEBREW_NO_PATCHELF_RB_WRITE"].blank? + if HOMEBREW_PATCHELF_RB_WRITE save_using_patchelf_rb interpreter, rpath else save_using_patchelf interpreter, rpath