diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index ad4140d25e..f6e7f7cd83 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -78,8 +78,8 @@ def build(bld):
         audiographer.defines      = [ 'LIBAUDIOGRAPHER_DLL_EXPORTS=1' ]
     else:
         audiographer              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=audiographer_sources)
-        audiographer.cxxflags     = [ '-fPIC' ]
-        audiographer.cflags       = [ '-fPIC' ]
+        audiographer.cxxflags     = [  bld.env['compiler_flags_dict']['pic'] ]
+        audiographer.cflags       = [ bld.env['compiler_flags_dict']['pic'] ]
         audiographer.defines      = []
 
     audiographer.name           = 'libaudiographer'
diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index 8de15ef74d..bd5735f05a 100644
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -80,8 +80,8 @@ def build(bld):
     obj.use      = 'libardour libpbd ardouralsautil'
     obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     if bld.env['build_target'] != 'mingw':
-        obj.cxxflags = [ '-fPIC' ]
-        obj.cflags   = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
     else:
         obj.cxxflags = [ ]
         obj.cflags   = [ ]
diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 13742a8374..4458655bf8 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -80,8 +80,8 @@ def build(bld):
         obj.defines      = [ 'LIBCANVAS_DLL_EXPORTS=1' ]
     else:
         obj = bld.stlib(features = 'cxx cxxstlib', source=canvas_sources)
-        obj.cxxflags     = [ '-fPIC' ]
-        obj.cflags       = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = [ ]
 
     obj.export_includes = ['.']
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 0eb4b2cb4c..5cc7957e31 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -83,8 +83,8 @@ def build(bld):
     libsmf.use          = [ 'libtemporal' ]
     libsmf.install_path = None
     if bld.env['build_target'] != 'mingw':
-        libsmf.cxxflags     = [ '-fPIC' ]
-        libsmf.cflags       = [ '-fPIC' ]
+        libsmf.cxxflags     = [ bld.env['compiler_flags_dict']['pic'] ]
+        libsmf.cflags       = [ bld.env['compiler_flags_dict']['pic'] ]
 
     lib_source = '''
             src/Control.cpp
@@ -106,8 +106,8 @@ def build(bld):
         obj.defines      = [ 'LIBEVORAL_DLL_EXPORTS' ]
     else:
         obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source)
-        obj.cxxflags     = [ '-fPIC' ]
-        obj.cflags       = [ '-fPIC' ]
+        obj.cxxflags     = [ bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags       = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = [ ]
 
     obj.export_includes = ['.']
diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript
index 849c31f301..ebce6efcb4 100644
--- a/libs/fluidsynth/wscript
+++ b/libs/fluidsynth/wscript
@@ -61,7 +61,7 @@ def build(bld):
         'src/fluid_settings.c',
         'src/fluid_sys.c'
         ],
-        cflags = [ '-fPIC', '-fvisibility=hidden' ],
+        cflags = [ bld.env['compiler_flags_dict']['pic'], '-fvisibility=hidden' ],
         includes = ['.', 'src/' ],
                target = 'libfluidsynth',
                use    = 'libfluidsynth_includes',
diff --git a/libs/fst/wscript b/libs/fst/wscript
index ca90b7207d..0bcd341980 100644
--- a/libs/fst/wscript
+++ b/libs/fst/wscript
@@ -66,7 +66,7 @@ def build(bld):
         obj.target = 'ardour-vst-scanner.exe.so'
         obj.uselib = ['GIOMM', 'DL']
         obj.use = [ 'libpbd' ]
-        obj.cxxflags  = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
     else:
         obj = bld (features = 'cxx c cxxprogram')
         obj.source = ( 'scanner.cc' )
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 8da17f58b0..605596f951 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -76,7 +76,7 @@ def build(bld):
         obj.defines      = [ 'LIBGTKMM2EXT_DLL_EXPORTS', 'ABSTRACT_UI_EXPORTS' ]
     else:
         obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=sources)
-        obj.cxxflags     = [ '-fPIC' ]
+        obj.cxxflags     = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = [ ]
 
     obj.export_includes = ['.']
diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript
index 2c870661b8..383289fbec 100644
--- a/libs/hidapi/wscript
+++ b/libs/hidapi/wscript
@@ -57,7 +57,7 @@ def build(bld):
         obj.linkflags      = [ '-lsetupapi', '-mwindows' ]
         obj.uselib         = 'SETUPAPI'
     else:
-        obj.cflags        += [ '-fPIC' ]
+        obj.cflags        += [ bld.env['compiler_flags_dict']['pic'] ]
         if sys.platform == 'darwin':
             obj.source     = 'mac/hid.c'
             obj.framework  = [ 'IOKit', 'CoreFoundation' ]
diff --git a/libs/libltc/wscript b/libs/libltc/wscript
index 8cf7bb6389..fde888c426 100644
--- a/libs/libltc/wscript
+++ b/libs/libltc/wscript
@@ -43,7 +43,7 @@ def build(bld):
          )
 
     bld.stlib (source = ['ltc.c', 'timecode.c', 'encoder.c', 'decoder.c'],
-               cflags = [ '-fPIC' ],
+               cflags = [ bld.env['compiler_flags_dict']['pic'] ],
                includes = ['.'],
                target = 'libltc',
                use    = 'libltc_includes'
diff --git a/libs/lua/wscript b/libs/lua/wscript
index b67820f3cc..3936e552e9 100644
--- a/libs/lua/wscript
+++ b/libs/lua/wscript
@@ -22,12 +22,12 @@ def configure(conf):
 
 def build(bld):
     obj=bld.stlib (source = ['lua.cc', 'luastate.cc'],
-               cflags = [ '-fPIC' ],
-               cxxflags = [ '-fPIC' ],
-               includes = ['.'],
-               export_includes = ['.'],
-               target = 'liblua',
-               uselib = [ 'SIGCPP', 'DL' ]
+                   cflags = [ bld.env['compiler_flags_dict']['pic'] ],
+                   cxxflags = [ bld.env['compiler_flags_dict']['pic'] ],
+                   includes = ['.'],
+                   export_includes = ['.'],
+                   target = 'liblua',
+                   uselib = [ 'SIGCPP', 'DL' ]
                )
     autowaf.ensure_visible_symbols (obj, True)
 
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index 19e0bbddac..54a8e02065 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -61,7 +61,7 @@ def build(bld):
         obj.defines      = [ 'LIBMIDIPP_DLL_EXPORTS=1' ]
     else:
         obj              = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources)
-        obj.cxxflags     = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = []
 
     # everybody loves JACK
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index cf4beba9fb..cedd3c13ba 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -151,8 +151,8 @@ def build(bld):
         obj.defines = [ 'LIBPBD_DLL_EXPORTS=1' ]
     else:
         obj              = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources)
-        obj.cxxflags     = [ '-fPIC' ]
-        obj.cflags     = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = []
 
     if bld.is_defined('DEBUG_RT_ALLOC'):
diff --git a/libs/plugins/a-comp.lv2/wscript b/libs/plugins/a-comp.lv2/wscript
index e450e919f0..fcfe1dca39 100644
--- a/libs/plugins/a-comp.lv2/wscript
+++ b/libs/plugins/a-comp.lv2/wscript
@@ -39,7 +39,7 @@ def build(bld):
         obj = bld(features     = 'c cshlib',
                   source       = 'a-comp.c',
                   name         = 'a-comp',
-                  cflags       = [ '-fPIC',  bld.env['compiler_flags_dict']['c99'] ],
+                  cflags       = [ bld.env['compiler_flags_dict']['pic'],  bld.env['compiler_flags_dict']['c99'] ],
                   includes     = [ '../../ardour', '../shared' ],
                   target       = '../../LV2/%s/a-comp' % bundle,
                   install_path = '${LV2DIR}/%s' % bundle,
diff --git a/libs/plugins/a-delay.lv2/wscript b/libs/plugins/a-delay.lv2/wscript
index 666ef0d5ab..5ce87deac8 100644
--- a/libs/plugins/a-delay.lv2/wscript
+++ b/libs/plugins/a-delay.lv2/wscript
@@ -39,7 +39,7 @@ def build(bld):
         obj = bld(features     = 'c cshlib',
                   source       = 'a-delay.c',
                   name         = 'a-delay',
-                  cflags       = [ '-fPIC',  bld.env['compiler_flags_dict']['c99'] ],
+                  cflags       = [ bld.env['compiler_flags_dict']['pic'],  bld.env['compiler_flags_dict']['c99'] ],
                   includes     = [ '../../ardour' ],
                   target       = '../../LV2/%s/a-delay' % bundle,
                   install_path = '${LV2DIR}/%s' % bundle,
diff --git a/libs/plugins/a-eq.lv2/wscript b/libs/plugins/a-eq.lv2/wscript
index 0610ba2eea..00edc9b1bc 100644
--- a/libs/plugins/a-eq.lv2/wscript
+++ b/libs/plugins/a-eq.lv2/wscript
@@ -39,7 +39,7 @@ def build(bld):
         obj = bld(features     = 'c cshlib',
                   source       = 'a-eq.c',
                   name         = 'a-eq',
-                  cflags       = [ '-fPIC',  bld.env['compiler_flags_dict']['c99'] ],
+                  cflags       = [ bld.env['compiler_flags_dict']['pic'],  bld.env['compiler_flags_dict']['c99'] ],
                   includes     = [ '../../ardour' ],
                   target       = '../../LV2/%s/a-eq' % bundle,
                   install_path = '${LV2DIR}/%s' % bundle,
diff --git a/libs/plugins/a-exp.lv2/wscript b/libs/plugins/a-exp.lv2/wscript
index 27d2440086..554bee0a6a 100644
--- a/libs/plugins/a-exp.lv2/wscript
+++ b/libs/plugins/a-exp.lv2/wscript
@@ -39,7 +39,7 @@ def build(bld):
         obj = bld(features     = 'c cshlib',
                   source       = 'a-exp.c',
                   name         = 'a-exp',
-                  cflags       = [ '-fPIC',  bld.env['compiler_flags_dict']['c99'] ],
+                  cflags       = [ bld.env['compiler_flags_dict']['pic'],  bld.env['compiler_flags_dict']['c99'] ],
                   includes     = [ '../../ardour', '../shared' ],
                   target       = '../../LV2/%s/a-exp' % bundle,
                   install_path = '${LV2DIR}/%s' % bundle,
diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript
index af6fcf08a8..78d55eb896 100644
--- a/libs/plugins/a-fluidsynth.lv2/wscript
+++ b/libs/plugins/a-fluidsynth.lv2/wscript
@@ -38,7 +38,7 @@ def build(bld):
         obj = bld(features     = 'cxx cshlib',
                   source       = 'a-fluidsynth.cc',
                   name         = 'a-fluidsynth',
-                  cxxflags     = [ '-fPIC' ],
+                  cxxflags     = [ bld.env['compiler_flags_dict']['pic'] ],
                   includes     = [ '../../ardour' ],
                   target       = '../../LV2/%s/a-fluidsynth' % bundle,
                   install_path = '${LV2DIR}/%s' % bundle,
diff --git a/libs/plugins/a-reverb.lv2/wscript b/libs/plugins/a-reverb.lv2/wscript
index 35601f2179..ac14a2c4e8 100644
--- a/libs/plugins/a-reverb.lv2/wscript
+++ b/libs/plugins/a-reverb.lv2/wscript
@@ -38,7 +38,7 @@ def build(bld):
         obj = bld(features     = 'c cshlib',
                   source       = 'a-reverb.c',
                   name         = 'a-reverb',
-                  cflags       = [ '-fPIC',  bld.env['compiler_flags_dict']['c99'] ],
+                  cflags       = [ bld.env['compiler_flags_dict']['pic'],  bld.env['compiler_flags_dict']['c99'] ],
                   includes     = [ '../../ardour' ],
                   target       = '../../LV2/%s/a-reverb' % bundle,
                   install_path = '${LV2DIR}/%s' % bundle,
diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index 92dc9502b1..728d1fa94e 100644
--- a/libs/qm-dsp/wscript
+++ b/libs/qm-dsp/wscript
@@ -79,8 +79,9 @@ def build(bld):
     obj.vnum         = QM_DSP_VERSION
     obj.install_path = bld.env['LIBDIR']
     if bld.env['build_target'] != 'mingw':
-        obj.cxxflags += [ '-fPIC' ]
-        obj.cflags   += [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
+
 
 def shutdown():
     autowaf.shutdown()
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 6a11cadb4a..e56e4dc28b 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -24,7 +24,7 @@ def build(bld):
         obj.defines      = [ 'LIBCONTROLCP_DLL_EXPORTS' ]
     else:
         obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=controlcp_sources)
-        obj.cxxflags     = [ '-fPIC' ]
+        obj.cxxflags     = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = [ ]
 
     obj.export_includes = ['.', './control_protocol' ]
diff --git a/libs/temporal/wscript b/libs/temporal/wscript
index fc96d00b1b..84c638ab77 100644
--- a/libs/temporal/wscript
+++ b/libs/temporal/wscript
@@ -40,8 +40,8 @@ def build(bld):
         obj.defines      = [ 'LIBTEMPORAL_DLL_EXPORTS=1' ]
     else:
         obj = bld.stlib(features = 'cxx cxxstlib', source=temporal_sources)
-        obj.cxxflags     = [ '-fPIC' ]
-        obj.cflags       = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = [ ]
 
     obj.export_includes = ['.']
diff --git a/libs/waveview/wscript b/libs/waveview/wscript
index 35311fac17..a433b323a1 100644
--- a/libs/waveview/wscript
+++ b/libs/waveview/wscript
@@ -46,8 +46,8 @@ def build(bld):
         obj.defines      = [ 'LIBWAVEVIEW_DLL_EXPORTS=1' ]
     else:
         obj = bld.stlib(features = 'cxx cxxstlib', source=waveview_sources)
-        obj.cxxflags     = [ '-fPIC' ]
-        obj.cflags       = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = [ ]
 
     obj.export_includes = ['.']
diff --git a/libs/widgets/wscript b/libs/widgets/wscript
index 4a31086c10..0ddd0148d9 100644
--- a/libs/widgets/wscript
+++ b/libs/widgets/wscript
@@ -69,8 +69,8 @@ def build(bld):
         obj.defines      = [ 'LIBWIDGETS_DLL_EXPORTS=1' ]
     else:
         obj = bld.stlib(features = 'cxx cxxstlib', source=widgets_sources)
-        obj.cxxflags     = [ '-fPIC' ]
-        obj.cflags       = [ '-fPIC' ]
+        obj.cxxflags = [  bld.env['compiler_flags_dict']['pic'] ]
+        obj.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
         obj.defines      = [ ]
 
     obj.export_includes = ['.']
diff --git a/libs/zita-resampler/wscript b/libs/zita-resampler/wscript
index bdd4d333a1..03039d0d1d 100644
--- a/libs/zita-resampler/wscript
+++ b/libs/zita-resampler/wscript
@@ -42,7 +42,7 @@ def configure(conf):
 
 def build(bld):
     obj = bld.stlib(features = 'cxx cxxstlib', source = zresampler_sources)
-    obj.cxxflags        = [ '-fPIC', '-O3', '-ffast-math' ]
+    obj.cxxflags        = [ bld.env['compiler_flags_dict']['pic'], '-O3', '-ffast-math' ]
     obj.export_includes = ['.']
     obj.includes        = ['.']
     obj.name            = 'zita-resampler'