public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcc: Try to fix /bin/sh dependency

Browse Source
This commit is contained in:
Shea Levy
2018-03-17 21:58:15 -04:00
parent 86972b2321
commit a5d064826b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/7/default.nix
+7 -2
View File
@@ -214,7 +214,12 @@ stdenv.mkDerivation ({
--replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
''; '';
postPatch = postPatch = ''
configureScripts=$(find . -name configure)
for configureScript in $configureScripts; do
patchShebangs $configureScript
done
'' + (
if (hostPlatform.isHurd if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv' || (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig && libcCross ? crossConfig
@@ -273,7 +278,7 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
'' ''
) )
else null; else "");
# TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;