diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-22 07:28:10 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-22 07:28:10 -0400 |
| commit | d0a8866622066a0abe9a95e444676d283580dc37 (patch) | |
| tree | d9f6b2568aecaa32a679ea72676eeba3d3d28361 /pkgs/development/compilers/gcc/7/default.nix | |
| parent | 809b0d26bd34fcf13a35025dacf731c0a3d13292 (diff) | |
| parent | 31119d3ef68c515e857cf192e2c87e1b77d63a78 (diff) | |
| download | nixlib-d0a8866622066a0abe9a95e444676d283580dc37.tar nixlib-d0a8866622066a0abe9a95e444676d283580dc37.tar.gz nixlib-d0a8866622066a0abe9a95e444676d283580dc37.tar.bz2 nixlib-d0a8866622066a0abe9a95e444676d283580dc37.tar.lz nixlib-d0a8866622066a0abe9a95e444676d283580dc37.tar.xz nixlib-d0a8866622066a0abe9a95e444676d283580dc37.tar.zst nixlib-d0a8866622066a0abe9a95e444676d283580dc37.zip | |
Merge branch 'binutils-2.30' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc/7/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 0462231b064e..0b19aa95effe 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -214,7 +214,12 @@ stdenv.mkDerivation ({ --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 || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig @@ -273,7 +278,7 @@ stdenv.mkDerivation ({ 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, crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; |