OS-8326 Let smartos-live be buildable with gcc10

Reviewed by: Brian Bennett <brian.bennett@joyent.com>
Reviewed by: Mike Zeller <mike.zeller@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>

Jenkinsfile

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright 2021 Joyent, Inc.
+ * Copyright 2022 Joyent, Inc.
  */
 
 @Library('jenkins-joylib@v1.0.8') _
@@ -38,7 +38,7 @@ pipeline {
                 '<dd>build Illumos in DEBUG mode only [default: no]</dd>\n' +
                 '<dt>-h</dt>\n' +
                 '<dd>this message</dd>\n' +
-                '<dt>-p gcc4</dt>\n' +
+                '<dt>-p gcc10</dt>\n' +
                 '<dd>primary compiler version [default: gcc7]</dd>\n' +
                 '<dt>-P password</dt>\n' +
                 '<dd>platform root password [default: randomly chosen]</dd>\n' +
@@ -247,18 +247,12 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
                 }
             }
         }
-/*
- * Eliminate the gcc4 stage.  Keep it commented-out so when we bring up a
- * gcc10 stage, we don't have as much work to do.
- */
-/* BEGIN COMMENTED-OUT gcc4 STAGE */
-/*
-        stage('gcc4') {
+        stage('gcc10') {
             agent {
                 node {
                     label 'platform:true && image_ver:18.4.0 && pkgsrc_arch:x86_64 && ' +
                         'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:2'
-                    customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc4"
+                    customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc10"
                 }
             }
             when {
@@ -275,15 +269,15 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
             steps {
                 sh('git clean -fdx')
                 sh('''
-export PLAT_CONFIGURE_ARGS="-p gcc4 -r $PLAT_CONFIGURE_ARGS"
+export PLAT_CONFIGURE_ARGS="-p gcc10 -r $PLAT_CONFIGURE_ARGS"
 # enough to make sure we don't pollute the main Manta dir
-export PLATFORM_DEBUG_SUFFIX=-gcc4
-./tools/build_jenkins -c -d -S gcc4
+export PLATFORM_DEBUG_SUFFIX=-gcc10
+./tools/build_jenkins -c -d -S gcc10
                 ''')
             }
             post {
                 always {
-                    archiveArtifacts artifacts: 'output/gcc4/**',
+                    archiveArtifacts artifacts: 'output/gcc10/**',
                         onlyIfSuccessful: false,
                         allowEmptyArchive: true
                     cleanWs cleanWhenSuccess: true,
@@ -292,11 +286,10 @@ export PLATFORM_DEBUG_SUFFIX=-gcc4
                         cleanWhenNotBuilt: true,
                         deleteDirs: true
                     joySlackNotifications(
-                        channel: 'os', comment: 'gcc4')
+                        channel: 'os', comment: 'gcc10')
                 }
             }
         }
-*/ /* END COMMENTED-OUT gcc4 STAGE */
         stage('strap-cache') {
             agent {
                 node {

tools/build_jenkins

@@ -6,7 +6,7 @@
 #
 
 #
-# Copyright 2020 Joyent, Inc.
+# Copyright 2022 Joyent, Inc.
 #
 
 #
@@ -256,7 +256,7 @@ esac
 # Upload artifacts separately for smartos to ~~/public/SmartOS, only if this is
 # a non-debug, release build.
 # We check for an empty $PLATFORM_DEBUG_SUFFIX as that gets used as the way to
-# prevent downstream Jenkins builds (e.g. 'platform-gcc4') uploading artifacts
+# prevent downstream Jenkins builds (e.g. 'platform-gcc10') uploading artifacts
 # to the 'platform' Manta directory, even though they may not strictly be debug
 # builds.
 #