diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-11 12:01:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 12:01:09 +0000 |
| commit | 0e9411554dce69228ae9e348b1cbf6d89832ce91 (patch) | |
| tree | 5a6aaeecc43029e00d09e5102db00d3244409252 /pkgs/development/compilers/gcc | |
| parent | a76cede5ecb2b227a4d1104398c6d5744cf2cc88 (diff) | |
| parent | f6caf65a4a8031f9e1073949734d91b3293034b0 (diff) | |
| download | nixlib-0e9411554dce69228ae9e348b1cbf6d89832ce91.tar nixlib-0e9411554dce69228ae9e348b1cbf6d89832ce91.tar.gz nixlib-0e9411554dce69228ae9e348b1cbf6d89832ce91.tar.bz2 nixlib-0e9411554dce69228ae9e348b1cbf6d89832ce91.tar.lz nixlib-0e9411554dce69228ae9e348b1cbf6d89832ce91.tar.xz nixlib-0e9411554dce69228ae9e348b1cbf6d89832ce91.tar.zst nixlib-0e9411554dce69228ae9e348b1cbf6d89832ce91.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/pre-configure.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 6c36c0a21e2b..77179d739768 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -116,13 +116,12 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # Normally (for host != target case) --without-headers automatically # enables 'inhibit_libc=true' in gcc's gcc/configure.ac. But case of -# gcc->clang "cross"-compilation manages to evade it: there +# gcc->clang or dynamic->static "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 && - targetPlatform.config == hostPlatform.config && - (stdenv.cc.isClang || stdenv.targetPlatform.useLLVM or false)) '' + targetPlatform.config == hostPlatform.config) '' export inhibit_libc=true '' |