From 716d8a752a886019f32b6783b54666a55656ffda Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 20 Jun 2024 15:26:55 -0400 Subject: [PATCH] openbsd: Remove `STRIP` hack This is just a FreeBSD thing, not OpenBSD or NetBSD thing. --- pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix | 1 - pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix | 4 ---- 2 files changed, 5 deletions(-) diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix index 1a6b6d06a193..5ad6bb2edaa6 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libc/package.nix @@ -73,7 +73,6 @@ mkDerivation { ) "--undefined-version"; makeFlags = [ - "STRIP=-s" # flag to install, not command "COMPILER_VERSION=clang" "LIBC_TAGS=no" ]; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix index 371c6c58b91f..252854c2d93a 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/mkDerivation.nix @@ -51,7 +51,6 @@ lib.makeOverridable ( HOST_SH = stdenv'.shell; makeFlags = [ - "STRIP=-s" # flag to install, not command "-B" ]; @@ -85,9 +84,6 @@ lib.makeOverridable ( // lib.optionalAttrs stdenv'.hasCC { # TODO should CC wrapper set this? CPP = "${stdenv'.cc.targetPrefix}cpp"; - - # Since STRIP in `makeFlags` has to be a flag, not the binary itself - STRIPBIN = "${stdenv'.cc.bintools.targetPrefix}strip"; } // lib.optionalAttrs (attrs.headersOnly or false) { installPhase = "includesPhase";