Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 848fb00c13cf7ce84a46e5fd2d8d6e7d9c12b18a)
+++ Jenkinsfile	(revision 992c26d6faaa518bc023f8d5761686b0ae258f40)
@@ -2,7 +2,7 @@
 def build() {
 	build_stage 'Checkout'
-
+		def install_dir = pwd tmp: true
 		//checkout the source code and clean the repo
-		sh 'rm -rf *'
+		sh "rm -rf * ${install_dir}/*"
 		checkout scm
 
@@ -13,6 +13,5 @@
 		//escapes the sandbox
 		//Also specify the compiler by hand
-		def install_dir = pwd tmp: true
-		sh "CC=gcc-4.9 CXX=g++-4.9 ./configure --prefix=${install_dir} > /dev/null"
+		sh "./configure CXX=${currentCC.cpp-cc} --with-backend-compiler=${currentCC.cfa-backend-cc} --prefix=${install_dir} > /dev/null"
 
 		//Compile the project
@@ -32,8 +31,14 @@
 }
 
-def Compiler
+class CC_Desc {
+	String name
+	String cpp-cc
+	String cfa-backend-cc
+}
+
+def currentCC
 
 def build_stage(String name) {
-	def stage_name = "${Compiler} ${name}"
+	def stage_name = "${currentCC.name} ${name}".trim()
 	stage stage_name
 
@@ -49,5 +54,5 @@
 
 	try {
-		Compiler = 'gcc-4.9'
+		currentCC = ['gcc-4.9', 'g++-4.9', 'gcc-4.9'] as CC_Desc
 		build()
 
@@ -57,5 +62,5 @@
 		err = caughtError
 		log_needed = true
-		currentBuild.result = "${status_prefix} FAILURE"
+		currentBuild.result = "${status_prefix} FAILURE".trim()
 	}
 
@@ -76,5 +81,5 @@
 	def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
 
-	def email_subject = "[${project_name} git][BUILD - ${status}!]Build # ${env.BUILD_NUMBER} - ${env.BRANCH_NAME}"
+	def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"
 	def email_body = """This is an automated email from the Jenkins build machine. It was
 generated because of a git hooks/post-receive script following
