diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-05 07:56:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-05 08:02:48 +0000 |
| commit | a838aa244f52fcf9325e4d41d89a69ce900b09d0 (patch) | |
| tree | 9dbc24eb67c5fdb217cb1bea2c97fbfdc98e9c95 /pkgs/development/compilers/gcc | |
| parent | 894baab1654685f6420df497c62ad7015d636931 (diff) | |
| parent | d579416a56656f914412897973755d5b9908979b (diff) | |
| download | nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.gz nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.bz2 nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.lz nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.xz nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.tar.zst nixlib-a838aa244f52fcf9325e4d41d89a69ce900b09d0.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
The hash for pytensor is not correct, but that's also the case in master, so a merge commit isn't the place to fix it. Conflicts: pkgs/development/python-modules/faadelays/default.nix pkgs/development/python-modules/pytensor/default.nix pkgs/tools/admin/rset/default.nix
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/pre-configure.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 32e203ee4912..88a0bda3d0c6 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -119,7 +119,10 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # gcc->clang "cross"-compilation manages to evade it: there # hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config. # We explicitly inhibit libc headers use in this case as well. -+ lib.optionalString (targetPlatform != hostPlatform && withoutTargetLibc) '' ++ lib.optionalString (targetPlatform != hostPlatform && + withoutTargetLibc && + targetPlatform.config == hostPlatform.config && + (stdenv.cc.isClang || stdenv.targetPlatform.useLLVM)) '' export inhibit_libc=true '' |