Skip to content

Commit

Permalink
cc-wrapper: useGccForLibs for libcxx == null
Browse files Browse the repository at this point in the history
Since commit 11302dc ("clang, cc-wrapper: Move `--gcc-toolchain`
logic into CC wrapper") --gcc-toolchain was only passed i useGccForLibs
is true. However useGccForLibs is disabled if libcxx is null, which
results in the libcxxStdenv failing, since the linker can't find libgcc
while linking. Remove the condition check for libcxx == null, to let the
wrapper tests pass again.
  • Loading branch information
Emantor committed Dec 21, 2020
1 parent f6584a3 commit 708cb80
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion pkgs/build-support/cc-wrapper/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ let
else "";

useGccForLibs = isClang
&& libcxx == null
&& !(stdenv.targetPlatform.useLLVM or false)
&& !(stdenv.targetPlatform.useAndroidPrebuilt or false)
&& gccForLibs != null;
Expand Down

0 comments on commit 708cb80

Please sign in to comment.