Unverified Commit cb63ee9f authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by GitHub
Browse files

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

gcc: turn configureFlags into a sigle list, not nested list
parents cf2e2a65 69da37a8

pkgs/development/compilers/gcc/common/configure-flags.nix

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ let 
    ++ 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

    ++ 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.optional (targetPlatform != hostPlatform) "--disable-bootstrap"