diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-07-28 00:30:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 00:30:49 -0700 |
| commit | 88c63ca65a30eb83bd2a00d183a9f11819be43ad (patch) | |
| tree | 28deb0ec736374e6a61478ede77500b1537eb751 /pkgs/development/compilers/gcc/9/default.nix | |
| parent | 0049ace2ece4a4555c5582c3b5a74a548cfb60e9 (diff) | |
| parent | eece5d0dc0bbd7eaab1f09e608f89449f745003b (diff) | |
| download | nixpkgs-88c63ca65a30eb83bd2a00d183a9f11819be43ad.tar nixpkgs-88c63ca65a30eb83bd2a00d183a9f11819be43ad.tar.gz nixpkgs-88c63ca65a30eb83bd2a00d183a9f11819be43ad.tar.bz2 nixpkgs-88c63ca65a30eb83bd2a00d183a9f11819be43ad.tar.lz nixpkgs-88c63ca65a30eb83bd2a00d183a9f11819be43ad.tar.xz nixpkgs-88c63ca65a30eb83bd2a00d183a9f11819be43ad.tar.zst nixpkgs-88c63ca65a30eb83bd2a00d183a9f11819be43ad.zip | |
Merge pull request #182513 from trofi/strip-for-host-and-target
gcc: enable stripping for cross-compilers
Diffstat (limited to 'pkgs/development/compilers/gcc/9/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 60256036445..707ead542f0 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -24,9 +24,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -89,7 +86,7 @@ let majorVersion = "9"; in stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -233,9 +230,11 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; - - installTargets = optional stripped "install-strip"; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -276,8 +275,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, |