diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh
index 2b6d316d81e..b0ed01de4cf 100644
--- a/pkgs/build-support/setup-hooks/make-binary-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-binary-wrapper.sh
@@ -31,7 +31,12 @@ assertExecutable() {
 # use the `strings` command or open the binary file in a text editor.
 makeWrapper() {
     assertExecutable "$1"
-    makeDocumentedCWrapper "$1" "${@:3}" | cc -Os -x c -o "$2" -
+    makeDocumentedCWrapper "$1" "${@:3}" | \
+      cc \
+        -Wall -Werror -Wpedantic \
+        -Os \
+        -x c \
+        -o "$2" -
 }
 
 # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix
index c9e045a4d98..c5bb6970aac 100644
--- a/pkgs/test/make-binary-wrapper/default.nix
+++ b/pkgs/test/make-binary-wrapper/default.nix
@@ -3,7 +3,7 @@
 let
   env = { nativeBuildInputs = [ makeBinaryWrapper ]; };
   envCheck = runCommand "envcheck" env ''
-    ${gcc}/bin/cc -o $out ${./envcheck.c}
+    ${gcc}/bin/cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c}
   '';
   makeGoldenTest = testname: runCommand "test-wrapper_${testname}" env ''
     mkdir -p /tmp/foo