Merge pull request #108060 from matthewbauer/strip-musl-gcc
gcc: allow stripping gcc libraries
This commit is contained in:
commit
afc2edc3ee
@ -28,8 +28,8 @@
|
|||||||
, threadsCross ? null # for MinGW
|
, threadsCross ? null # for MinGW
|
||||||
, crossStageStatic ? false
|
, crossStageStatic ? false
|
||||||
, # Strip kills static libs of other archs (hence no cross)
|
, # Strip kills static libs of other archs (hence no cross)
|
||||||
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
|
stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system
|
||||||
&& stdenv.targetPlatform == stdenv.hostPlatform
|
&& stdenv.targetPlatform.system == stdenv.hostPlatform.system
|
||||||
, gnused ? null
|
, gnused ? null
|
||||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||||
, buildPackages
|
, buildPackages
|
||||||
|
@ -36,8 +36,8 @@
|
|||||||
, threadsCross ? null # for MinGW
|
, threadsCross ? null # for MinGW
|
||||||
, crossStageStatic ? false
|
, crossStageStatic ? false
|
||||||
, # Strip kills static libs of other archs (hence no cross)
|
, # Strip kills static libs of other archs (hence no cross)
|
||||||
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
|
stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system
|
||||||
&& stdenv.targetPlatform == stdenv.hostPlatform
|
&& stdenv.targetPlatform.system == stdenv.hostPlatform.system
|
||||||
, gnused ? null
|
, gnused ? null
|
||||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||||
, buildPackages
|
, buildPackages
|
||||||
|
@ -26,8 +26,8 @@
|
|||||||
, threadsCross ? null # for MinGW
|
, threadsCross ? null # for MinGW
|
||||||
, crossStageStatic ? false
|
, crossStageStatic ? false
|
||||||
, # Strip kills static libs of other archs (hence no cross)
|
, # Strip kills static libs of other archs (hence no cross)
|
||||||
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
|
stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system
|
||||||
&& stdenv.targetPlatform == stdenv.hostPlatform
|
&& stdenv.targetPlatform.system == stdenv.hostPlatform.system
|
||||||
, gnused ? null
|
, gnused ? null
|
||||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||||
, buildPackages
|
, buildPackages
|
||||||
|
@ -26,8 +26,8 @@
|
|||||||
, threadsCross ? null # for MinGW
|
, threadsCross ? null # for MinGW
|
||||||
, crossStageStatic ? false
|
, crossStageStatic ? false
|
||||||
, # Strip kills static libs of other archs (hence no cross)
|
, # Strip kills static libs of other archs (hence no cross)
|
||||||
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
|
stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system
|
||||||
&& stdenv.targetPlatform == stdenv.hostPlatform
|
&& stdenv.targetPlatform.system == stdenv.hostPlatform.system
|
||||||
, gnused ? null
|
, gnused ? null
|
||||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||||
, buildPackages
|
, buildPackages
|
||||||
|
@ -29,8 +29,8 @@
|
|||||||
, threadsCross ? null # for MinGW
|
, threadsCross ? null # for MinGW
|
||||||
, crossStageStatic ? false
|
, crossStageStatic ? false
|
||||||
, # Strip kills static libs of other archs (hence no cross)
|
, # Strip kills static libs of other archs (hence no cross)
|
||||||
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
|
stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system
|
||||||
&& stdenv.targetPlatform == stdenv.hostPlatform
|
&& stdenv.targetPlatform.system == stdenv.hostPlatform.system
|
||||||
, gnused ? null
|
, gnused ? null
|
||||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||||
, buildPackages
|
, buildPackages
|
||||||
|
@ -147,9 +147,9 @@ if test "$noSysDirs" = "1"; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "${targetConfig-}"; then
|
if [ -n "${targetConfig-}" ]; then
|
||||||
# The host strip will destroy some important details of the objects
|
# if stripping gcc, include target directory too
|
||||||
dontStrip=1
|
stripDebugList="${stripDebugList-lib lib32 lib64 libexec bin sbin} $targetConfig"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
eval "$oldOpts"
|
eval "$oldOpts"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user