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

Merge #82510: gcc: fix building cross on 32-bit host

Browse Source 
... into staging
This commit is contained in:
Vladimír Čunát 2020-03-22 08:44:40 +01:00
commit 4e6a21dbec
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/gcc/9/default.nix
View File

@ -245,12 +245,6 @@ stdenv.mkDerivation ({
inherit (stdenv) is64bit; 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 = { meta = {
homepage = https://gcc.gnu.org/; homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+

4
pkgs/development/compilers/gcc/builder.sh
View File

@ -201,11 +201,11 @@ postConfigure() {
preInstall() { preInstall() {
mkdir -p "$out/${targetConfig}/lib"
mkdir -p "$lib/${targetConfig}/lib"
# Make ‘lib64’ symlinks to ‘lib’. # Make ‘lib64’ symlinks to ‘lib’.
if [ -n "$is64bit" -a -z "$enableMultilib" ]; then if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
mkdir -p "$out/${targetConfig}/lib"
ln -s lib "$out/${targetConfig}/lib64" ln -s lib "$out/${targetConfig}/lib64"
mkdir -p "$lib/${targetConfig}/lib"
ln -s lib "$lib/${targetConfig}/lib64" ln -s lib "$lib/${targetConfig}/lib64"
fi fi
} }