diff options
| author | Adam Joseph <adam@westernsemico.com> | 2022-08-05 13:52:25 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2022-08-05 13:52:25 -0700 |
| commit | a6daffb11876769af3f079a37516c1832048b9ea (patch) | |
| tree | 8911dd94d0efb692c2330ea0f636b6bdc7fa7f6d /pkgs/development/compilers/gcc/10/default.nix | |
| parent | dfba0bf93b716a72b107fd182e01e5ba859dc013 (diff) | |
gcc: factor out $linkLib64toLib, move it from bash to nix
This commit factors out the conditional which creates the `lib64->lib` symlink in the `preInstall` phase, and calculates its value in nix code rather than bash code so touching it doesn't cause a global rebuild on every platform.
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index d4230055313a9..dbfdbb79be995 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; }; dontDisableStatic = true; @@ -268,8 +268,6 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; inherit enableMultilib enableShared; - is64bit = stdenv.is64bit && !stdenv.hostPlatform.isMips64n32; - meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ |