diff --git a/src/SConscript b/src/SConscript
index d3c5a5cd8b..f905b1f95b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -60,7 +60,11 @@ Import('*')
 # Children need to see the environment
 Export('env')
 
-build_env = [(opt, env[opt]) for opt in export_vars]
+all_export_vars = set()
+all_export_vars.update(export_vars)
+all_export_vars.update(sticky_vars.keys())
+
+build_env = [(opt, env[opt]) for opt in all_export_vars]
 
 from code_formatter import code_formatter
 
@@ -533,7 +537,7 @@ for extra_dir in extras_dir_list:
             build_dir = os.path.join(env['BUILDDIR'], root[prefix_len:])
             SConscript(os.path.join(root, 'SConscript'), variant_dir=build_dir)
 
-for opt in export_vars:
+for opt in all_export_vars:
     env.ConfigFile(opt)
 
 def makeTheISA(source, target, env):
diff --git a/src/arch/SConsopts b/src/arch/SConsopts
index 38b02f51f5..048814e995 100644
--- a/src/arch/SConsopts
+++ b/src/arch/SConsopts
@@ -33,5 +33,3 @@ def add_isa_lists():
             sorted(set(main.Split('${ALL_GPU_ISAS}')))),
         )
 AfterSConsopts(add_isa_lists)
-
-export_vars.extend(['TARGET_ISA', 'TARGET_GPU_ISA'])
diff --git a/src/arch/arm/fastmodel/SConsopts b/src/arch/arm/fastmodel/SConsopts
index 74165fe89f..c7bfd8498a 100644
--- a/src/arch/arm/fastmodel/SConsopts
+++ b/src/arch/arm/fastmodel/SConsopts
@@ -45,9 +45,3 @@ sticky_vars.AddVariables(
      'The maximum number of ARM licenses to use concurrently', 1),
     ('SIMGEN', 'simgen executable', os.environ.get('SIMGEN', default_simgen)),
 )
-
-export_vars.extend([
-        'ARMLMD_LICENSE_FILE',
-        'PVLIB_HOME',
-        'PVLIB_FLAVOR',
-])
diff --git a/src/base/SConsopts b/src/base/SConsopts
index 9fafd641c3..5c8d5f7d73 100644
--- a/src/base/SConsopts
+++ b/src/base/SConsopts
@@ -80,5 +80,4 @@ sticky_vars.Add(BoolVariable('USE_POSIX_CLOCK', 'Use POSIX Clocks',
 
 
 export_vars.extend([
-        'HAVE_FENV', 'HAVE_PNG', 'USE_POSIX_CLOCK', 'HAVE_VALGRIND',
-        'HAVE_DEPRECATED_NAMESPACE'])
+        'HAVE_FENV', 'HAVE_PNG', 'HAVE_VALGRIND', 'HAVE_DEPRECATED_NAMESPACE'])
diff --git a/src/cpu/kvm/SConsopts b/src/cpu/kvm/SConsopts
index be413e1bdc..72f2a2e5e6 100644
--- a/src/cpu/kvm/SConsopts
+++ b/src/cpu/kvm/SConsopts
@@ -76,7 +76,7 @@ if main['KVM_ISA']:
                 'Enable hardware virtualized (KVM) CPU models', True))
 else:
     main['USE_KVM'] = False
+    export_vars.append('USE_KVM')
     warning("Can not enable KVM, host seems to lack KVM support")
 
-export_vars.append('USE_KVM')
 export_vars.append('KVM_ISA')
diff --git a/src/gpu-compute/SConsopts b/src/gpu-compute/SConsopts
index 1737c13f08..251ac5d8cf 100644
--- a/src/gpu-compute/SConsopts
+++ b/src/gpu-compute/SConsopts
@@ -27,5 +27,3 @@ Import('*')
 
 sticky_vars.Add(BoolVariable('BUILD_GPU', 'Build the compute-GPU model',
                              False))
-
-export_vars.append('BUILD_GPU')
diff --git a/src/mem/ruby/SConsopts b/src/mem/ruby/SConsopts
index 80713c4b28..f26b6d05f8 100644
--- a/src/mem/ruby/SConsopts
+++ b/src/mem/ruby/SConsopts
@@ -34,5 +34,3 @@ AfterSConsopts(add_protocols_var)
 
 sticky_vars.Add(('NUMBER_BITS_PER_SET', 'Max elements in set (default 64)',
                  64))
-
-export_vars.extend(['PROTOCOL', 'NUMBER_BITS_PER_SET'])
diff --git a/src/systemc/SConsopts b/src/systemc/SConsopts
index 891431cf76..7f59955cad 100644
--- a/src/systemc/SConsopts
+++ b/src/systemc/SConsopts
@@ -46,5 +46,3 @@ main.AddMethod(use_systemc_check, 'UseSystemcCheck')
 
 sticky_vars.Add(BoolVariable('USE_SYSTEMC', 'Enable SystemC API support',
                              main.UseSystemcCheck()))
-
-export_vars.append('USE_SYSTEMC')