pyrox.dev
cc-wrapper: remove dead code for `langJava`
+2
-6
pkgs/build-support/cc-wrapper/default.nix
+2
-6
pkgs/build-support/cc-wrapper/default.nix
···
545
545
export named_fc=${targetPrefix}gfortran
546
546
''
547
547
548
-
+ optionalString cc.langJava or false ''
549
-
wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj
550
-
''
551
-
552
548
+ optionalString cc.langGo or false ''
553
549
wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo
554
550
wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go
···
559
555
bintools
560
556
]
561
557
++ extraTools
562
-
++ optionals cc.langD or cc.langJava or false [ zlib ];
558
+
++ optionals cc.langD or false [ zlib ];
563
559
depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;
564
560
565
561
setupHooks = [
···
796
792
ln -s ${cc.man} $man
797
793
ln -s ${cc.info} $info
798
794
''
799
-
+ optionalString (cc.langD or cc.langJava or false && !isArocc) ''
795
+
+ optionalString (cc.langD or false && !isArocc) ''
800
796
echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
801
797
''
802
798