diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-03-17 15:03:44 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-03-17 16:42:52 +0000 |
| commit | 4bdbae5ad13b0c8c98232ebb70a288815ef5f012 (patch) | |
| tree | 461515ddc68c39947463b940efa9e7359cfb3a05 /pkgs/build-support/cc-wrapper | |
| parent | 23949862041c26b37f9927920ce43e20739b716f (diff) | |
cc-wrapper: wrap `cpp` for cross lust like to native
Without this change $target-cpp is used unwrapped and is missing
standard header search paths among other things).
Example failure:
$ nix build -f. -L pkgsStatic.netbsd.compat
...
> checking how to run the C preprocessor... x86_64-unknown-linux-musl-cpp
> configure: error: in `/build/cvs-export/tools/compat':
> configure: error: C preprocessor "x86_64-unknown-linux-musl-cpp" fails sanity check
> See `config.log' for more details
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 96fd8b66bb428..d2a1ed39ee07f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -228,6 +228,10 @@ stdenv.mkDerivation { if [ -e $ccPath/cpp ]; then wrap ${targetPrefix}cpp $wrapper $ccPath/cpp + '' + lib.optionalString (hostPlatform != targetPlatform) '' + elif [ -e $ccPath/${targetPrefix}cpp ]; then + wrap ${targetPrefix}cpp $wrapper $ccPath/${targetPrefix}cpp + '' + '' fi '' |