From da138686f64bef6b2ab9e5d4907c0a89ff336b43 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 18 Sep 2019 11:33:23 -0400 Subject: [PATCH] Revert "setup.sh introduce isELFExec, isELFDyn" This is broken in PIE (#68513). Best to not keep it in otherwise something else will start using it. This reverts commit e1b80a5a99a3013c6556ec2e2e73ef6ca8e8b80b. --- pkgs/stdenv/generic/setup.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 311292169ecd..ebcedce60b87 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -212,18 +212,6 @@ isELF() { if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi } -# Return success if the specified file is an ELF object -# and its e_type is ET_EXEC (executable file) -isELFExec() { - grep -ao -P '^\177ELF.{11}\x00\x02' "$1" >/dev/null -} - -# Return success if the specified file is an ELF object -# and its e_type is ET_DYN (shared object file) -isELFDyn() { - grep -ao -P '^\177ELF.{11}\x00\x03' "$1" >/dev/null -} - # Return success if the specified file is a script (i.e. starts with # "#!"). isScript() {