Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e48c1f8e8c74
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: afc2edc3ee44
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Jan 21, 2021

  1. gcc: allow stripping gcc libraries 

    When cross compiling to the same kernel / arch combination, it is safe
to use strip of libraries. This happens when cross-compiling musl
programs. dontStrip is now set in each gcc compiler instead of in
gcc/builder.sh.

Fixes #75476
    @matthewbauer
    matthewbauer committed Jan 21, 2021

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    4bdcddf View commit details

Commits on Jan 22, 2021

  1. Merge pull request #108060 from matthewbauer/strip-musl-gcc 

    gcc: allow stripping gcc libraries
    @matthewbauer
    matthewbauer authored Jan 22, 2021

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    afc2edc View commit details
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/10/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
&& stdenv.targetPlatform == stdenv.hostPlatform
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
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
&& stdenv.targetPlatform == stdenv.hostPlatform
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
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,8 +26,8 @@
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
&& stdenv.targetPlatform == stdenv.hostPlatform
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
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,8 +26,8 @@
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
&& stdenv.targetPlatform == stdenv.hostPlatform
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
4 changes: 2 additions & 2 deletions pkgs/development/compilers/gcc/9/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@
, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
&& stdenv.targetPlatform == stdenv.hostPlatform
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
6 changes: 3 additions & 3 deletions pkgs/development/compilers/gcc/builder.sh
View file
Original file line number Diff line number Diff line change
@@ -147,9 +147,9 @@ if test "$noSysDirs" = "1"; then
fi
fi

if test -n "${targetConfig-}"; then
# The host strip will destroy some important details of the objects
dontStrip=1
if [ -n "${targetConfig-}" ]; then
# if stripping gcc, include target directory too
stripDebugList="${stripDebugList-lib lib32 lib64 libexec bin sbin} $targetConfig"
fi

eval "$oldOpts"