Commit 69da37a8 authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

gcc: turn configureFlags into a sigle list, not nested list 

Before the change:

    $ nix repl pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
    nix-repl> :p powerpc64le.bootGCC.configureFlags
    [ ... "--enable-targets=powerpcle-linux" [ "--with-long-double-128" ] "--target=powerpc64le-unknown-linux-gnu" ]

After the change:

    nix-repl> :p powerpc64le.bootGCC.configureFlags
    [ ... "--enable-targets=powerpcle-linux" "--with-long-double-128" "--target=powerpc64le-unknown-linux-gnu" ]
parent fc9e22fc

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"