diff --git a/Makefile.include b/Makefile.include
index 77f021992dd9263769ca19f3ee36a1e18e31d209..3c19baad5d823333e142215cd46ae3e701569952 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -153,7 +153,12 @@ ifneq (0,$(shell test -d $(RIOTBOARD)/$(BOARD); echo $$?))
 endif
 
 # Use TOOLCHAIN environment variable to select the toolchain to use.
-# Default: gnu
+# Default for macOS: llvm; for other OS: gnu
+ifeq ($(BOARD),native)
+ifeq ($(OS),Darwin)
+TOOLCHAIN ?= llvm
+endif
+endif
 TOOLCHAIN ?= gnu
 
 # TOOLCHAIN = clang is an alias for TOOLCHAIN = llvm
diff --git a/pkg/oonf_api/Makefile.include b/pkg/oonf_api/Makefile.include
index 5af9c3071fb2fcb27d001914e67fc6d12288ec1e..236f801eb16bc8f9113fee377424f9b12946c02b 100644
--- a/pkg/oonf_api/Makefile.include
+++ b/pkg/oonf_api/Makefile.include
@@ -1,5 +1,5 @@
 INCLUDES += -I$(PKGDIRBASE)/oonf_api/src-api
 
-ifeq ($(shell uname -s),Darwin)
-	CFLAGS += -Wno-reserved-id-macro -Wno-keyword-macro
+ifeq ($(TOOLCHAIN), llvm)
+    CFLAGS += -Wno-keyword-macro -Wno-parentheses-equality
 endif
diff --git a/pkg/tinydtls/Makefile.include b/pkg/tinydtls/Makefile.include
index 74dae8fd3391dbc695f7d74f8082664fd4564abc..fa5e757b7444cc337765828a4c5c77ab393863a6 100644
--- a/pkg/tinydtls/Makefile.include
+++ b/pkg/tinydtls/Makefile.include
@@ -2,7 +2,7 @@ PKG_BUILDDIR ?= $(PKGDIRBASE)/tinydtls
 
 INCLUDES += -I$(PKG_BUILDDIR)
 
-ifeq ($(shell uname -s),Darwin)
+ifeq ($(TOOLCHAIN), llvm)
     CFLAGS += -Wno-gnu-zero-variadic-macro-arguments -Wno-unused-function
 endif