MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #236396 from jleightcap/jl/gcj-fix

Browse source 
gcj: fix compiler
This commit is contained in:
Weijia Wang 2023-06-08 00:10:31 +03:00 committed by GitHub
commit 0b7a8b6982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/build-support/cc-wrapper/default.nix
View file

@ -301,7 +301,7 @@ stdenv.mkDerivation {
''; '';
strictDeps = true; strictDeps = true;
propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or cc.langJava or false [ zlib ];
depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages;
setupHooks = [ setupHooks = [
@ -464,7 +464,7 @@ stdenv.mkDerivation {
+ optionalString propagateDoc '' + optionalString propagateDoc ''
ln -s ${cc.man} $man ln -s ${cc.man} $man
ln -s ${cc.info} $info ln -s ${cc.info} $info
'' + optionalString (cc.langD or false) '' '' + optionalString (cc.langD or cc.langJava or false) ''
echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags echo "-B${zlib}${zlib.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
'' ''