From cf71af617655d6901cb70fcd668550e398db170e Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 26 Nov 2024 10:06:22 +0000 Subject: [PATCH] gcc: restore dropped `isl` line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think this was a rebase mishap and causes a ton of rebuilds. Not sure if we actually need the Darwin condition any more (or to be using the older `isl` version?), but `master` isn’t the place to find out :) Fixes: 90474914ee2c8f592342d3e3cc16e0e7693479f8 --- pkgs/development/compilers/gcc/all.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index ca95661e0d6e..444253a37878 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -24,6 +24,7 @@ let profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + isl = if stdenv.hostPlatform.isDarwin then null else isl_0_20; # do not allow version skew when cross-building gcc # # When `gcc` is cross-built (`build` != `target` && `host` == `target`)