void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

try setting scl_source on centos7 for newer compilers

Browse source
This commit is contained in:
Grant Limberg 2020-06-16 10:40:01 -07:00
parent e808b4b45f
commit 77342f8571
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -136,7 +136,8 @@ endif(WIN32)
if ( if (
CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR 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}") message("++ Adding flags for processor ${CMAKE_SYSTEM_PROCESSOR}")
add_compile_options(-maes -mrdrnd -mpclmul -msse -msse2 -mssse3) add_compile_options(-maes -mrdrnd -mpclmul -msse -msse2 -mssse3)

7
Jenkinsfile vendored
View file

@ -55,6 +55,7 @@ def buildStaticBinaries() {
def runtime = docker.image("ztbuild/${distro}-${platform}:latest") def runtime = docker.image("ztbuild/${distro}-${platform}:latest")
runtime.inside { runtime.inside {
dir("build") { dir("build") {
def cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1"' def cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1"'
if (platform == "i386") { if (platform == "i386") {
cmakeFlags = 'CMAKE_ARGS="-DBUILD_32BIT=1 -DBUILD_STATIC=1"' cmakeFlags = 'CMAKE_ARGS="-DBUILD_32BIT=1 -DBUILD_STATIC=1"'
@ -357,7 +358,11 @@ def buildCentosNative() {
def runtime = docker.image("ztbuild/${distro}-${arch}:latest") def runtime = docker.image("ztbuild/${distro}-${arch}:latest")
runtime.inside { runtime.inside {
dir("build") { 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 'make redhat'
// sh "mkdir -p ${distro}" // sh "mkdir -p ${distro}"
// sh "cp -av `find ~/rpmbuild/ -type f -name \"*.rpm\"` ${distro}/" // sh "cp -av `find ~/rpmbuild/ -type f -name \"*.rpm\"` ${distro}/"