lol

Merge #174125: gdc: nicer eval failure from versions >= 12

+9 -2
+9 -2
pkgs/development/compilers/gcc/12/default.nix
··· 3 3 , langAda ? false 4 4 , langObjC ? stdenv.targetPlatform.isDarwin 5 5 , langObjCpp ? stdenv.targetPlatform.isDarwin 6 + , langD ? false 6 7 , langGo ? false 7 8 , reproducibleBuild ? true 8 9 , profiledCompiler ? false ··· 41 42 assert langGo -> langCC; 42 43 assert langAda -> gnatboot != null; 43 44 45 + # TODO: fixup D bootstapping, probably by using gdc11 (and maybe other changes). 46 + # error: GDC is required to build d 47 + assert !langD; 48 + 44 49 # threadsCross is just for MinGW 45 50 assert threadsCross != null -> stdenv.targetPlatform.isWindows; 46 51 ··· 68 73 url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.1.0...gcc-11.1.0-arm-20210504.diff"; 69 74 sha256 = "sha256-JqCGJAfbOxSmkNyq49aFHteK/RFsCSLQrL9mzUCnaD0="; 70 75 }) 76 + ++ optional langD ../libphobos.patch 71 77 72 78 # Obtain latest patch with ../update-mcfgthread-patches.sh 73 79 ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; ··· 208 214 enableShared 209 215 210 216 langC 217 + langD 211 218 langCC 212 219 langFortran 213 220 langAda ··· 248 255 249 256 inherit 250 257 (import ../common/extra-target-flags.nix { 251 - inherit lib stdenv crossStageStatic libcCross threadsCross; 258 + inherit lib stdenv crossStageStatic langD libcCross threadsCross; 252 259 }) 253 260 EXTRA_FLAGS_FOR_TARGET 254 261 EXTRA_LDFLAGS_FOR_TARGET 255 262 ; 256 263 257 264 passthru = { 258 - inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; 265 + inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; 259 266 isGNU = true; 260 267 }; 261 268