Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 8f466d4db75c1ecb22e2eee7f4b835291d9ccf3f)
+++ Jenkinsfile	(revision 4b82db37c567e49c1be9d89a525f948dca4a6257)
@@ -98,4 +98,61 @@
 	public final String DescLong
 	public final String DescShort
+
+
+	//Description of a compiler (Must be serializable since pipelines are persistent)
+	private class CC_Desc implements Serializable {
+		public String cc_name
+		public String cpp_cc
+		public String cfa_cc
+
+		CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
+			this.cc_name = cc_name
+			this.cpp_cc = cpp_cc
+			this.cfa_cc = cfa_cc
+		}
+	}
+
+	private static CC_Desc compiler_from_params(String cc) {
+		switch( cc ) {
+			case 'gcc-6':
+				return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+			break
+			case 'gcc-5':
+				return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+			break
+			case 'gcc-4.9':
+				return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+			break
+			case 'clang':
+				return new CC_Desc('clang', 'clang++', 'gcc-6')
+			break
+			default :
+				error "Unhandled compiler : ${cc}"
+		}
+	}
+
+	//Description of an architecture (Must be serializable since pipelines are persistent)
+	private class Arch_Desc implements Serializable {
+		public String name
+		public String flags
+
+		Arch_Desc(String name, String flags) {
+			this.name  = name
+			this.flags = flags
+		}
+	}
+
+	private static Arch_Desc architecture_from_params( String arch ) {
+		switch( arch ) {
+			case 'x64':
+				return new Arch_Desc('x64', '--host=x86_64')
+			break
+			case 'x86':
+				return new Arch_Desc('x86', '--host=i386')
+			break
+			default :
+				error "Unhandled architecture : ${arch}"
+		}
+	}
 
 	BuildSettings(java.util.Collections$UnmodifiableMap param, java.util.TreeMap scmVars) {
@@ -209,60 +266,4 @@
 }
 
-//Description of a compiler (Must be serializable since pipelines are persistent)
-class CC_Desc implements Serializable {
-	public String cc_name
-	public String cpp_cc
-	public String cfa_cc
-
-	CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-		this.cc_name = cc_name
-		this.cpp_cc = cpp_cc
-		this.cfa_cc = cfa_cc
-	}
-}
-
-def compiler_from_params(cc) {
-	switch( cc ) {
-		case 'gcc-6':
-			return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-		break
-		case 'gcc-5':
-			return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-		break
-		case 'gcc-4.9':
-			return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-		break
-		case 'clang':
-			return new CC_Desc('clang', 'clang++', 'gcc-6')
-		break
-		default :
-			error "Unhandled compiler : ${cc}"
-	}
-}
-
-//Description of an architecture (Must be serializable since pipelines are persistent)
-class Arch_Desc implements Serializable {
-	public String name
-	public String flags
-
-	Arch_Desc(String name, String flags) {
-		this.name  = name
-		this.flags = flags
-	}
-}
-
-def architecture_from_params( arch ) {
-	switch( arch ) {
-		case 'x64':
-			return new Arch_Desc('x64', '--host=x86_64')
-		break
-		case 'x86':
-			return new Arch_Desc('x86', '--host=i386')
-		break
-		default :
-			error "Unhandled architecture : ${arch}"
-	}
-}
-
 //===========================================================================================================
 // Main compilation routines