656a657,660
> # Sticky variables that should be exported
> export_vars = []
> Export('export_vars')
>
701,704c705,707
< env.ExportVariables = ['FULL_SYSTEM', 'USE_FENV', \
< 'USE_MYSQL', 'NO_FAST_ALLOC', 'FAST_ALLOC_DEBUG', \
< 'FAST_ALLOC_STATS', 'SS_COMPATIBLE_FP', \
< 'USE_CHECKER', 'TARGET_ISA', 'CP_ANNOTATE']
---
> export_vars += ['FULL_SYSTEM', 'USE_FENV', 'USE_MYSQL',
> 'NO_FAST_ALLOC', 'FAST_ALLOC_DEBUG', 'FAST_ALLOC_STATS',
> 'SS_COMPATIBLE_FP', 'USE_CHECKER', 'TARGET_ISA', 'CP_ANNOTATE']