summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2022-08-05 11:05:07 -0700
committerAdam Joseph <adam@westernsemico.com>2022-08-05 11:07:16 -0700
commitdfba0bf93b716a72b107fd182e01e5ba859dc013 (patch)
tree624712e43e111b25e03b187be63880d25394dd68
parentcbc80ff32b7c827f6a780688f251a6d592a873d5 (diff)
downloadnixpkgs-dfba0bf93b716a72b107fd182e01e5ba859dc013.tar
nixpkgs-dfba0bf93b716a72b107fd182e01e5ba859dc013.tar.gz
nixpkgs-dfba0bf93b716a72b107fd182e01e5ba859dc013.tar.bz2
nixpkgs-dfba0bf93b716a72b107fd182e01e5ba859dc013.tar.lz
nixpkgs-dfba0bf93b716a72b107fd182e01e5ba859dc013.tar.xz
nixpkgs-dfba0bf93b716a72b107fd182e01e5ba859dc013.tar.zst
nixpkgs-dfba0bf93b716a72b107fd182e01e5ba859dc013.zip
gcc: do not create lib64->lib links on mips64n32
On mips, gcc follows the somewhat awkward IRIX convention of putting
mips64 binaries in `lib64` and mips64n32 binaries in `lib32`.  So on
mips64n32 we do not want the `lib64` symlinks.
-rw-r--r--pkgs/development/compilers/gcc/10/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/11/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/12/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/4.8/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/4.9/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/7/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/8/default.nix2
-rw-r--r--pkgs/development/compilers/gcc/9/default.nix2
9 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix
index 1c223fa82f4..d4230055313 100644
--- a/pkgs/development/compilers/gcc/10/default.nix
+++ b/pkgs/development/compilers/gcc/10/default.nix
@@ -268,7 +268,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableMultilib enableShared;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix
index ca3a89af180..9dd5ee98850 100644
--- a/pkgs/development/compilers/gcc/11/default.nix
+++ b/pkgs/development/compilers/gcc/11/default.nix
@@ -276,7 +276,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix
index 6fdc31079a8..0094b8418c7 100644
--- a/pkgs/development/compilers/gcc/12/default.nix
+++ b/pkgs/development/compilers/gcc/12/default.nix
@@ -271,7 +271,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index bc93d6e1358..d3bc2a8f827 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -291,7 +291,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index cc675de2254..0b505177b9b 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -310,7 +310,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index d108dc11f18..ad959bad09a 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -322,7 +322,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e4e1f2038de..25eac397dd1 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -276,7 +276,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 7e94ec61c6b..177d40ebe7b 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -255,7 +255,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 707ead542f0..2cac0be1aef 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -270,7 +270,7 @@ stdenv.mkDerivation ({
   enableParallelBuilding = true;
   inherit enableShared enableMultilib;
 
-  inherit (stdenv) is64bit;
+  is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32;
 
   meta = {
     homepage = "https://gcc.gnu.org/";