diff options
| author | wrvsrx <wrvsrx@outlook.com> | 2023-01-31 11:40:23 +0800 |
|---|---|---|
| committer | wrvsrx <wrvsrx@outlook.com> | 2023-01-31 11:40:23 +0800 |
| commit | b59d61aa489b3ae6a08cfe5b7684068b644d26f1 (patch) | |
| tree | 1963ee6ed076c5a08285fbac3ce59d6d7104ddd0 /pkgs/build-support/cc-wrapper | |
| parent | ee2b2cef35f4c555360e560bb62b689af80fa5ca (diff) | |
cc-wrapper: revert change to `-isystem`
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 cbf199117d300..55be5f3a9d0a4 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/libcxx-cxxflags + echo "-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/libcxx-cxxflags + echo "-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/libcxx-cxxflags + echo "-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 '' |