diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-25 00:02:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 00:02:20 +0000 |
| commit | c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e (patch) | |
| tree | 5f3173b32dd8391102c6ceee2cf224393771ac02 /pkgs/build-support/cc-wrapper | |
| parent | de7e4a82e44535246fc53a21cf383808b2611784 (diff) | |
| parent | 000178d44d0cf57116452b16a5a4a8aec8515bdf (diff) | |
Merge master into staging-next
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 fc82fd02615da..4efed40631983 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -379,11 +379,11 @@ stdenv.mkDerivation { echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done '' - + optionalString (libcxx.isLLVM or false) ('' + + optionalString (libcxx.isLLVM or false) '' echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags - echo "-lc++abi" >> $out/nix-support/libcxx-ldflags - '') + echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags + '' ## ## Initial CFLAGS |