From 69da37a8fd88d6d7efbe308601f022b6e1dd624e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 18 Jul 2022 19:10:22 +0100 Subject: [PATCH] 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" ] --- pkgs/development/compilers/gcc/common/configure-flags.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index bebf91114d70..c208f6618af9 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -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"