diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-08 00:18:22 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2023-10-08 00:18:22 -0600 |
| commit | 7f16b623fc12a7bb73f3098814c100b006497514 (patch) | |
| tree | 404234e7762594327209b9791d9b8554f00f5c2b /pkgs/development/compilers/gcc | |
| parent | 4309990c6fffe6c810d6aba0b12ecb350970f0c4 (diff) | |
| parent | 13b87aaddf40db4708049eaf821eae6b515b427b (diff) | |
| download | nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.gz nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.bz2 nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.lz nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.xz nixlib-7f16b623fc12a7bb73f3098814c100b006497514.tar.zst nixlib-7f16b623fc12a7bb73f3098814c100b006497514.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
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 '' |