Changeset d0c91a6 for Jenkinsfile

Timestamp:

Jan 15, 2019, 4:16:15 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into jenkins-sandbox

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -118 +118 @@
                         }
 
-                        sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
 
                         //Compile the project
@@ -239 +239 @@
 //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
+        public String name
+        public String CXX
+        public String CC
+
+        CC_Desc(String name, String CXX, String CC) {
+                this.name = name
+                this.CXX = CXX
+                this.CC = CC
         }
 }
@@ -315 +315 @@
 
                 def full = param.RunAllTests ? " (Full)" : ""
-                this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
-
-                this.DescLong = """Compiler              : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_cc })
+                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
+
+                this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
 Architecture            : ${ this.Architecture.name }
 Arc Flags               : ${ this.Architecture.flags }