diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-07-20 15:46:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 15:46:36 +0100 |
| commit | cb63ee9ff82a2c6193cf059d18c194a24f9de807 (patch) | |
| tree | 6d192c60835e348f4872cfdb9bf7f2acc06dfa94 /pkgs/development/compilers/gcc | |
| parent | cf2e2a65ae02d3f7ea4599c78b994303207a3d20 (diff) | |
| parent | 69da37a8fd88d6d7efbe308601f022b6e1dd624e (diff) | |
Merge pull request #181999 from trofi/gcc-clean-up-configureFlags
gcc: turn configureFlags into a sigle list, not nested list
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/configure-flags.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 910d93d42da13..bf33e1a1dad5f 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" |