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}/"