diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-28 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 12:01:16 +0000 |
| commit | a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243 (patch) | |
| tree | 4df0a4239ef144053e491b8904ec194dc8e57d3d /pkgs/development/compilers/gcc/common/configure-flags.nix | |
| parent | 86197a8023b233a84be08d43ac933688fcbd057e (diff) | |
| parent | d0796a6c6779bda9addfccc07f00565e8c9a897c (diff) | |
| download | nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.gz nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.bz2 nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.lz nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.xz nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.tar.zst nixpkgs-a1d3be1d4226b7312ce6a8aa8e96a0cdbbf74243.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/gcc/common/configure-flags.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/configure-flags.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 997771c2abf..1d75966797b 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -170,8 +170,11 @@ let "--enable-cloog-backend=isl" ] - # Ada options - ++ lib.optional langAda "--enable-libada" + # Ada options, gcc can't build the runtime library for a cross compiler + ++ lib.optional langAda + (if hostPlatform == targetPlatform + then "--enable-libada" + else "--disable-libada") # Java options ++ lib.optionals langJava [ |