diff --git a/interface/meson.build b/interface/meson.build
index 73fc061f4..476140d81 100644
--- a/interface/meson.build
+++ b/interface/meson.build
@@ -82,10 +82,7 @@ _static_libs += static_library(
     'cblas_drot',
     'rot.c',
     include_directories:  _inc,
-    c_args: [        '-O2',
-        '-DSMALL_MATRIX_OPT',
-        '-DMAX_STACK_ALLOC=2048',
-        '-Wall',
+    c_args: [
         '-m64',
         '-DF_INTERFACE_GFORT',
         '-fPIC',
diff --git a/kernel/meson.build b/kernel/meson.build
index f8bc23700..946cc5301 100644
--- a/kernel/meson.build
+++ b/kernel/meson.build
@@ -786,9 +786,6 @@ _configs = [
    'undef': ['COMPLEX', 'COMPLEX'],
    'def': ['DOUBLE'],
    'addl': [fma3_flag,
-        '-DSMALL_MATRIX_OPT',
-        '-DMAX_STACK_ALLOC=2048',
-        '-Wall',
         '-m64',
         '-DF_INTERFACE_GFORT',
         '-fPIC',
diff --git a/meson.build b/meson.build
index 4ea4552d1..693a46f37 100644
--- a/meson.build
+++ b/meson.build
@@ -44,6 +44,7 @@ no_affinity = get_option('no_affinity')
 build_cpp_thread_safety_test = get_option('build_cpp_thread_safety_test')
 build_cpp_thread_safety_gemv = get_option('build_cpp_thread_safety_gemv')
 build_static_libs = get_option('build_static_libs')
+max_stack_alloc = get_option('max_stack_alloc')
 
 if host_machine.system() == 'linux'
     no_affinity = true
@@ -136,7 +137,17 @@ configure_file(output : 'getarch_conf.h',
 #   configuration : conf_data)
 
 # Makefile.system
-# Ignoring all the hostarch checks and conflicts for arch in BSD for now
+cpu_fam = target_machine.cpu_family()
+
+if cpu_fam in ['x86_64', 'ppc64', 'ppc']
+  add_project_arguments([
+   '-DSMALL_MATRIX_OPT',
+   f'-DMAX_STACK_ALLOC=@max_stack_alloc@',
+  ], language:'c')
+endif
+
+
+# Ignoring other hostarch checks and conflicts for arch in BSD for now
 _inc = include_directories('.')
 # subdir('lapack-netlib')
 subdir('interface')