Changeset 93fe3154


Ignore:
Timestamp:
Dec 13, 2018, 4:29:37 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
ca0f5e34
Parents:
95d0a5db
Message:

Update jenkins to no longer use CC

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Jenkins/TestRegen

    r95d0a5db r93fe3154  
    7070        //escapes the sandbox
    7171        //Also specify the compiler by hand
    72         sh "./configure CXX=clang++ --host=${arch} --with-backend-compiler=gcc-6 --prefix=${install_dir} --enable-silent-rules --quiet"
     72        sh "./configure CXX=clang++ CC=gcc-6 --host=${arch} --enable-silent-rules --quiet"
    7373
    7474        //Compile the project
    75         sh 'make -j 8 --no-print-directory install'
     75        sh 'make -j 8 --no-print-directory'
    7676
    7777        //Regenerate the desired tests
  • Jenkinsfile

    r95d0a5db r93fe3154  
    114114                        }
    115115
    116                         sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
     116                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
    117117
    118118                        //Compile the project
     
    235235//Description of a compiler (Must be serializable since pipelines are persistent)
    236236class CC_Desc implements Serializable {
    237         public String cc_name
    238         public String cpp_cc
    239         public String cfa_cc
    240 
    241         CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
    242                 this.cc_name = cc_name
    243                 this.cpp_cc = cpp_cc
    244                 this.cfa_cc = cfa_cc
     237        public String name
     238        public String CC
     239        public String CXX
     240
     241        CC_Desc(String name, String CC, String CXX) {
     242                this.name = name
     243                this.CC = CC
     244                this.CXX = CXX
    245245        }
    246246}
     
    309309
    310310                def full = param.RunAllTests ? " (Full)" : ""
    311                 this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
    312 
    313                 this.DescLong = """Compiler              : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_cc })
     311                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
     312
     313                this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
    314314Architecture            : ${ this.Architecture.name }
    315315Arc Flags               : ${ this.Architecture.flags }
Note: See TracChangeset for help on using the changeset viewer.