diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-08 12:01:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-08 12:01:52 +0000 |
| commit | 81871f4c87a029aa89e9e9f58037ab2bc50baf0b (patch) | |
| tree | 0503b9eba37e27fbd54e8cdd749180eb06b5e75b /pkgs/development/compilers/gcc | |
| parent | 187f681cb4921d413ad940834baab18654cb0f9a (diff) | |
| parent | 0b4a97a07f72bcf265034e5e2d95d6fa02e694a7 (diff) | |
| download | nixlib-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar nixlib-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.gz nixlib-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.bz2 nixlib-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.lz nixlib-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.xz nixlib-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.tar.zst nixlib-81871f4c87a029aa89e9e9f58037ab2bc50baf0b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/pre-configure.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 88a0bda3d0c6..6c36c0a21e2b 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -122,7 +122,7 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc && targetPlatform.config == hostPlatform.config && - (stdenv.cc.isClang || stdenv.targetPlatform.useLLVM)) '' + (stdenv.cc.isClang || stdenv.targetPlatform.useLLVM or false)) '' export inhibit_libc=true '' |