alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #123419 from sternenseemann/gcc-native-cross

Browse source 
gcc*: force building a cross compiler if host and target platform differ
This commit is contained in:
John Ericson 2021-05-17 16:05:03 -07:00 committed by GitHub
parent a900462807 2d176b593b
commit 6ad0e5cab2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 9 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

9
pkgs/development/compilers/gcc/common/pre-configure.nix
View file

@ -1,4 +1,4 @@
{ lib, version, hostPlatform { lib, version, hostPlatform, targetPlatform
, gnatboot ? null , gnatboot ? null
, langAda ? false , langAda ? false
, langJava ? false , langJava ? false
@ -58,3 +58,10 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+ lib.optionalString (hostPlatform.isDarwin && langJit) '' + lib.optionalString (hostPlatform.isDarwin && langJit) ''
export STRIP='strip -x' export STRIP='strip -x'
'' ''
# HACK: if host and target config are the same, but the platforms are
# actually different we need to convince the configure script that it
# is in fact building a cross compiler although it doesn't believe it.
+ lib.optionalString (targetPlatform.config == hostPlatform.config && targetPlatform != hostPlatform) ''
substituteInPlace configure --replace is_cross_compiler=no is_cross_compiler=yes
''