diff --git a/src/Makefile b/src/Makefile
index 321118dbb..2d279775d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,10 +20,11 @@ DEPENDENCY_TARGETS=hiredis linenoise lua
 NODEPS:=clean distclean
 
 # Default settings
-ifeq (,$(findstring clang,$(CC)))
-  STD=-std=c99 -pedantic -DREDIS_STATIC=''
-else
-  STD=-std=c99 -Wno-c11-extensions -pedantic -DREDIS_STATIC=''
+STD=-std=c99 -pedantic -DREDIS_STATIC=''
+ifneq (,$(findstring clang,$(CC)))
+ifneq (,$(findstring FreeBSD,$(uname_S)))
+  STD+=-Wno-c11-extensions
+endif
 endif
 WARN=-Wall -W -Wno-missing-field-initializers
 OPT=$(OPTIMIZATION)
diff --git a/src/debug.c b/src/debug.c
index 8cc53d92f..70def3b30 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1189,6 +1189,8 @@ void serverLogHexDump(int level, char *descr, void *value, size_t len) {
 void watchdogSignalHandler(int sig, siginfo_t *info, void *secret) {
 #ifdef HAVE_BACKTRACE
     ucontext_t *uc = (ucontext_t*) secret;
+#else
+    (void)secret;
 #endif
     UNUSED(info);
     UNUSED(sig);