Changeset b9d1242

Timestamp:

Jul 27, 2025, 3:24:36 PM (7 weeks ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

2b0e754

Parents:

f449d1e (diff), 1eea589f (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• Jenkins/FullBuild (modified) (1 diff)
• Jenkins/TestRegen (modified) (1 diff)
• Jenkinsfile (modified) (1 diff)

Jenkins/FullBuild

@@ -20 +20 @@
                                         //gcc_9_x86_new: { trigger_build( 'gcc-9',   'x86', false ) },
                                         //gcc_10_x86_new: { trigger_build( 'gcc-10',  'x86', false ) },
-                                        gcc_7_x64_new: { trigger_build( 'gcc-7',   'x64', false ) },
-                                        gcc_8_x64_new: { trigger_build( 'gcc-8',   'x64', false ) },
+                                        //gcc_7_x64_new: { trigger_build( 'gcc-7',   'x64', false ) },
+                                        //gcc_8_x64_new: { trigger_build( 'gcc-8',   'x64', false ) },
                                         gcc_9_x64_new: { trigger_build( 'gcc-9',   'x64', false ) },
                                         gcc_10_x64_new: { trigger_build( 'gcc-10',  'x64', false ) },

Jenkins/TestRegen

@@ -74 +74 @@
         //escapes the sandbox
         //Also specify the compiler by hand
-        sh "./configure CXX=clang++ CC=gcc-6 --host=${arch} --enable-silent-rules --quiet"
+        sh "./configure CXX=clang++ CC=gcc --host=${arch} --enable-silent-rules --quiet"
 
         //Compile the project

Jenkinsfile

@@ -299 +299 @@
                         //      this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6', '-flto=auto')
                         // break
-                        case 'gcc-7':
-                                this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7', '-flto=auto')
-                        break
-                        case 'gcc-8':
-                                this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8', '-flto=auto')
-                        break
+                        // case 'gcc-7':
+                        //      this.Compiler = new CC_Desc('gcc-7', 'g++-7', 'gcc-7', '-flto=auto')
+                        // break
+                        // case 'gcc-8':
+                        //      this.Compiler = new CC_Desc('gcc-8', 'g++-8', 'gcc-8', '-flto=auto')
+                        // break
                         case 'gcc-9':
                                 this.Compiler = new CC_Desc('gcc-9', 'g++-9', 'gcc-9', '-flto=auto')