ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-21 20:58:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #182666 from trofi/fix-non-cross-cross

Browse Source 
gcc: always enable inhibit_libc=true for --without-headers builds
This commit is contained in:
Sergei Trofimovich 2022-07-24 15:00:09 +01:00 committed by GitHub
commit 9e11882c40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/10/default.nix
View File

@ -191,7 +191,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic;
};
dontDisableStatic = true;

2
pkgs/development/compilers/gcc/11/default.nix
View File

@ -199,7 +199,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic;
};
dontDisableStatic = true;

2
pkgs/development/compilers/gcc/12/default.nix
View File

@ -194,7 +194,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic;
};
dontDisableStatic = true;

2
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -198,7 +198,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform langJava langGo;
inherit version targetPlatform hostPlatform langJava langGo crossStageStatic;
};
dontDisableStatic = true;

2
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -218,7 +218,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform langJava langGo;
inherit version targetPlatform hostPlatform langJava langGo crossStageStatic;
};
dontDisableStatic = true;

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

@ -230,7 +230,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langJava langAda langGo;
inherit version targetPlatform hostPlatform gnatboot langJava langAda langGo crossStageStatic;
};
dontDisableStatic = true;

2
pkgs/development/compilers/gcc/7/default.nix
View File

@ -197,7 +197,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform langGo;
inherit version targetPlatform hostPlatform langGo crossStageStatic;
};
dontDisableStatic = true;

2
pkgs/development/compilers/gcc/8/default.nix
View File

@ -180,7 +180,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform langGo;
inherit version targetPlatform hostPlatform langGo crossStageStatic;
};
dontDisableStatic = true;

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

@ -193,7 +193,7 @@ stdenv.mkDerivation ({
preConfigure = import ../common/pre-configure.nix {
inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic;
};
dontDisableStatic = true;

13
pkgs/development/compilers/gcc/common/pre-configure.nix
View File

@ -3,7 +3,9 @@
, langAda ? false
, langJava ? false
, langJit ? false
, langGo }:
, langGo
, crossStageStatic
}:
assert langJava -> lib.versionOlder version "7";
assert langAda -> gnatboot != null; let
@ -67,3 +69,12 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+ lib.optionalString (targetPlatform.config == hostPlatform.config && targetPlatform != hostPlatform) ''
substituteInPlace configure --replace is_cross_compiler=no is_cross_compiler=yes
''
# Normally (for host != target case) --without-headers automatically
# enables 'inhibit_libc=true' in gcc's gcc/configure.ac. But case of
# gcc->clang "cross"-compilation manages to evade it: there
# hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config.
# We explicitly inhibit libc headers use in this case as well.
+ lib.optionalString (targetPlatform != hostPlatform && crossStageStatic) ''
export inhibit_libc=true
''