ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #181999 from trofi/gcc-clean-up-configureFlags

Browse Source 
gcc: turn configureFlags into a sigle list, not nested list
This commit is contained in:
Sergei Trofimovich 2022-07-20 15:46:36 +01:00 committed by GitHub
commit cb63ee9ff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/common/configure-flags.nix
View File

@ -195,7 +195,7 @@ let
++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
# TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc # TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc
++ lib.optional (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; })
++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags
++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"