--- a/gsm-fw/cfgmagic/processconf.sh	Sun Jun 29 21:59:14 2014 +0000
+++ b/gsm-fw/cfgmagic/processconf.sh	Sun Jun 29 22:37:29 2014 +0000
@@ -62,11 +62,16 @@
 	export_to_m4	RAMFFS_NBLOCKS
 fi
 
-# At some point the list of build components will probably become
-# dependent on feature or maybe even target configurations, but for
-# now it is static.
+# The list of build components: we have some invariants that are always
+# included, and some others that are included depending on the configuration.
 
 BUILD_COMPONENTS="bsp nucleus riviera serial services sprintf sysglue"
+
+if [ "$CONFIG_GPF" = 1 ]
+then
+	BUILD_COMPONENTS="$BUILD_COMPONENTS gpf"
+fi
+
 export_to_mk BUILD_COMPONENTS
 
 # The support for building flashable images is not here yet,