From 77342f8571a1e4117446e319d426f6e5301bf8de Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Tue, 16 Jun 2020 10:40:01 -0700
Subject: [PATCH] try setting scl_source on centos7 for newer compilers

---
 CMakeLists.txt | 3 ++-
 Jenkinsfile    | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66c5cad89..a25ea78a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,8 @@ endif(WIN32)
 
 if (
 	CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR
-	CMAKE_SYSTEM_PROCESSOR MATCHES "amd64"
+	CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" OR
+	CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64"
 )
 	message("++ Adding flags for processor ${CMAKE_SYSTEM_PROCESSOR}")
 	add_compile_options(-maes -mrdrnd -mpclmul -msse -msse2 -mssse3)
diff --git a/Jenkinsfile b/Jenkinsfile
index e6a41ed0f..8bcd87e02 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,6 +55,7 @@ def buildStaticBinaries() {
                 def runtime = docker.image("ztbuild/${distro}-${platform}:latest")
                 runtime.inside {
                     dir("build") {
+
                         def cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1"'
                         if (platform == "i386") {
                             cmakeFlags = 'CMAKE_ARGS="-DBUILD_32BIT=1 -DBUILD_STATIC=1"'
@@ -357,7 +358,11 @@ def buildCentosNative() {
                 def runtime = docker.image("ztbuild/${distro}-${arch}:latest")
                 runtime.inside {
                     dir("build") {
-                        sh 'make -j4'
+                        if (distro == 'centos7') {
+                            sh 'source scl_source enable devtoolset-8 llvm-toolset-7 && make'
+                        } else {
+                            sh 'make'
+                        }
                         // sh 'make redhat'
                         // sh "mkdir -p ${distro}"
                         // sh "cp -av `find ~/rpmbuild/ -type f -name \"*.rpm\"` ${distro}/"