diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-03-22 08:44:40 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-03-22 08:44:40 +0100 |
| commit | 4e6a21dbec4f1da256979bbb19ab5c25f0996d7e (patch) | |
| tree | 64b3f6d3d55fa20fe19c742cbd79f73f60a2616b /pkgs/development/compilers/gcc | |
| parent | 46f8756aee25ec58a4552a2c2213760a34c73726 (diff) | |
| parent | 83fa0d940012decf0cbd301b7795b7fa00a49739 (diff) | |
| download | nixpkgs-4e6a21dbec4f1da256979bbb19ab5c25f0996d7e.tar nixpkgs-4e6a21dbec4f1da256979bbb19ab5c25f0996d7e.tar.gz nixpkgs-4e6a21dbec4f1da256979bbb19ab5c25f0996d7e.tar.bz2 nixpkgs-4e6a21dbec4f1da256979bbb19ab5c25f0996d7e.tar.lz nixpkgs-4e6a21dbec4f1da256979bbb19ab5c25f0996d7e.tar.xz nixpkgs-4e6a21dbec4f1da256979bbb19ab5c25f0996d7e.tar.zst nixpkgs-4e6a21dbec4f1da256979bbb19ab5c25f0996d7e.zip | |
Merge #82510: gcc: fix building cross on 32-bit host
... into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/builder.sh | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index ee020fbeea8..46918b1f0a1 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -245,12 +245,6 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; - # In this particular combination it stopped creating lib output at all. - # TODO: perhaps find a better fix? (ideally understand what's going on) - postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit - then ''mkdir "$lib"'' - else null; - meta = { homepage = https://gcc.gnu.org/; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index b153687980a..22a21e5b25c 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -201,11 +201,11 @@ postConfigure() { preInstall() { + mkdir -p "$out/${targetConfig}/lib" + mkdir -p "$lib/${targetConfig}/lib" # Make ‘lib64’ symlinks to ‘lib’. if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p "$out/${targetConfig}/lib" ln -s lib "$out/${targetConfig}/lib64" - mkdir -p "$lib/${targetConfig}/lib" ln -s lib "$lib/${targetConfig}/lib64" fi } |