diff --git a/src/cpu/SConsopts b/src/cpu/SConsopts
index 2dec0d5c48..af35a20cdb 100644
--- a/src/cpu/SConsopts
+++ b/src/cpu/SConsopts
@@ -25,12 +25,12 @@
 
 Import('*')
 
-all_cpus = set()
 def CpuModel(name):
-    all_cpus.add(name)
+    main.Append(ALL_CPU_MODELS=[name])
 
 Export('CpuModel')
 
 def add_cpu_models_var():
-    sticky_vars.Add(ListVariable('CPU_MODELS', 'CPU models', [], all_cpus))
+    sticky_vars.Add(ListVariable('CPU_MODELS', 'CPU models', [],
+                set(main.get('ALL_CPU_MODELS', []))))
 AfterSConsopts(add_cpu_models_var)