Skip to content

Commit

Permalink
Configure warnings on Nix derivation
Browse files Browse the repository at this point in the history
This way the presence of the flag remains user configurable through the
nix_file or nix_file_content attribute.
  • Loading branch information
aherrmann committed Nov 23, 2020
1 parent 60e0819 commit b3cce10
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nixpkgs/toolchains/cc.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ let
# Override cc
rm -f $out/bin/cc $out/bin/clang $out/bin/clang++
makeWrapper ${stdenv.cc}/bin/cc $out/bin/cc --add-flags \
"-isystem ${llvmPackages.libcxx}/include/c++/v1 \
"-Wno-unused-command-line-argument \
-isystem ${llvmPackages.libcxx}/include/c++/v1 \
-F${CoreFoundation}/Library/Frameworks \
-F${CoreServices}/Library/Frameworks \
-F${Security}/Library/Frameworks \
Expand Down Expand Up @@ -148,7 +149,6 @@ in
add_compiler_option_if_supported -Wself-assign
# Disable problematic warnings.
add_compiler_option_if_supported -Wunused-but-set-parameter
add_compiler_option_if_supported -Wno-unused-command-line-argument
# has false positives
add_compiler_option_if_supported -Wno-free-nonheap-object
# Enable coloring even if there's no attached terminal. Bazel removes the
Expand Down

0 comments on commit b3cce10

Please sign in to comment.