diff --git a/deps/Makefile b/deps/Makefile
index 809ecb7..2a2ee90 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -15,7 +15,6 @@ include ../dpf/Makefile.base.mk
 # --------------------------------------------------------------
 # custom build flags
 
-BASE_FLAGS += -fno-finite-math-only
 BASE_FLAGS += -I../include
 BASE_FLAGS += -I../include/neon-compat
 BASE_FLAGS += -pthread
@@ -32,6 +31,9 @@ BASE_FLAGS += -fno-strict-aliasing -flto
 LINK_FLAGS += -fno-strict-aliasing -flto -Werror=odr -Werror=lto-type-mismatch
 endif
 
+BUILD_C_FLAGS += -fno-finite-math-only
+BUILD_CXX_FLAGS += -fno-finite-math-only
+
 # --------------------------------------------------------------
 # override VCV arch.mk stuff so we can build more architectures
 
diff --git a/plugins/Makefile b/plugins/Makefile
index 7035204..6547277 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -511,8 +511,6 @@ else
 BASE_FLAGS += -DARCH_LIN
 endif
 
-BUILD_C_FLAGS += -std=gnu11
-
 BASE_FLAGS += -fno-finite-math-only
 BASE_FLAGS += -I../dpf/dgl/src/nanovg
 BASE_FLAGS += -I../dpf/distrho
@@ -555,6 +553,10 @@ ifeq ($(WITH_LTO),true)
 BASE_FLAGS += -fno-strict-aliasing -flto
 endif
 
+BUILD_C_FLAGS += -std=gnu11
+BUILD_C_FLAGS += -fno-finite-math-only
+BUILD_CXX_FLAGS += -fno-finite-math-only
+
 # --------------------------------------------------------------
 # FIXME lots of warnings from VCV side
 
diff --git a/src/Makefile b/src/Makefile
index 5036099..1dd43ff 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,7 +30,6 @@ else
 BASE_FLAGS += -DARCH_LIN
 endif
 
-BASE_FLAGS += -fno-finite-math-only
 BASE_FLAGS += -I../dpf/dgl/src/nanovg
 BASE_FLAGS += -I../dpf/distrho
 BASE_FLAGS += -I../include
@@ -66,6 +65,8 @@ BASE_FLAGS += -fno-strict-aliasing -flto
 endif
 
 BUILD_C_FLAGS += -std=gnu11
+BUILD_C_FLAGS += -fno-finite-math-only
+BUILD_CXX_FLAGS += -fno-finite-math-only
 
 # --------------------------------------------------------------
 # Rack files to build
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 5ac6e4c..a42e0dd 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -72,7 +72,6 @@ else
 BASE_FLAGS += -DARCH_LIN
 endif
 
-BASE_FLAGS += -fno-finite-math-only
 BASE_FLAGS += -I..
 BASE_FLAGS += -I../../dpf/dgl/src/nanovg
 BASE_FLAGS += -I../../include
@@ -104,6 +103,8 @@ BASE_FLAGS += -fno-strict-aliasing -flto
 endif
 
 BUILD_C_FLAGS += -std=gnu11
+BUILD_C_FLAGS += -fno-finite-math-only
+BUILD_CXX_FLAGS += -fno-finite-math-only
 
 # --------------------------------------------------------------
 # FIXME lots of warnings from VCV side