diff options
| author | wrvsrx <wrvsrx@outlook.com> | 2023-01-04 16:09:55 +0800 |
|---|---|---|
| committer | wrvsrx <wrvsrx@outlook.com> | 2023-01-31 11:13:11 +0800 |
| commit | ee2b2cef35f4c555360e560bb62b689af80fa5ca (patch) | |
| tree | cbbf2bc86fff1e212975215c4eeba17fac2df948 /pkgs/build-support/cc-wrapper | |
| parent | a18367ea2ccaad1cd30125c7c659a546086b44e9 (diff) | |
cc-wrapper: add -cxx-isystem to libcxx-cxxflags instead of libc-cflags
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f0d9311039580..cbf199117d300 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -366,14 +366,14 @@ stdenv.mkDerivation { '' + optionalString (libcxx == null && (useGccForLibs && gccForLibs.langCC or false)) '' for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do - echo "-cxx-isystem $dir" >> $out/nix-support/libc-cflags + echo "-cxx-isystem $dir" >> $out/nix-support/libcxx-cxxflags done for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*/${targetPlatform.config}; do - echo "-cxx-isystem $dir" >> $out/nix-support/libc-cflags + echo "-cxx-isystem $dir" >> $out/nix-support/libcxx-cxxflags done '' + optionalString (libcxx.isLLVM or false) '' - echo "-cxx-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libc-cflags + echo "-cxx-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags '' |