Changeset d0c91a6 for Jenkinsfile


Ignore:
Timestamp:
Jan 15, 2019, 4:16:15 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r5e49e47 rd0c91a6  
    118118                        }
    119119
    120                         sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
     120                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
    121121
    122122                        //Compile the project
     
    239239//Description of a compiler (Must be serializable since pipelines are persistent)
    240240class CC_Desc implements Serializable {
    241         public String cc_name
    242         public String cpp_cc
    243         public String cfa_cc
    244 
    245         CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
    246                 this.cc_name = cc_name
    247                 this.cpp_cc = cpp_cc
    248                 this.cfa_cc = cfa_cc
     241        public String name
     242        public String CXX
     243        public String CC
     244
     245        CC_Desc(String name, String CXX, String CC) {
     246                this.name = name
     247                this.CXX = CXX
     248                this.CC = CC
    249249        }
    250250}
     
    315315
    316316                def full = param.RunAllTests ? " (Full)" : ""
    317                 this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
    318 
    319                 this.DescLong = """Compiler              : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_cc })
     317                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
     318
     319                this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
    320320Architecture            : ${ this.Architecture.name }
    321321Arc Flags               : ${ this.Architecture.flags }
Note: See TracChangeset for help on using the changeset viewer.