mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-03-12 04:36:29 -07:00
fix flags
This commit is contained in:
parent
f3defdf3a6
commit
ee53f056ce
@ -157,9 +157,9 @@ if(NOT PACKAGE_STATIC)
|
||||
option(BUILD_ARM_V5 "Build ARMv5" OFF)
|
||||
option(BUILD_ARM_v6 "Build ARMv6" OFF)
|
||||
|
||||
if (BUILD_ARM_V5 AND BUILD_ARM_V6)
|
||||
if(BUILD_ARM_V5 AND BUILD_ARM_V6)
|
||||
message(FATAL_ERROR "BUILD_ARM_V5 and BUILD_ARM_V6 are mutually exclusive!")
|
||||
endif()
|
||||
endif(BUILD_ARM_V5 AND BUILD_ARM_V6)
|
||||
|
||||
if(BUILD_32BIT)
|
||||
set(CMAKE_SYSTEM_PROCESSOR "x86" CACHE STRING "system processor")
|
||||
@ -191,13 +191,13 @@ if(NOT PACKAGE_STATIC)
|
||||
)
|
||||
endif(BUILD_STATIC)
|
||||
|
||||
if (BUILD_ARM_V5)
|
||||
if(BUILD_ARM_V5)
|
||||
set(GOARM "GOARM=5")
|
||||
endif (BUILD_ARM_V5)
|
||||
endif(BUILD_ARM_V5)
|
||||
|
||||
if (BUILD_ARM_v6)
|
||||
if(BUILD_ARM_V6)
|
||||
set(GOARM "GOARM=6")
|
||||
endif (BUILD_ARM_V6)
|
||||
endif(BUILD_ARM_V6)
|
||||
endif(APPLE)
|
||||
endif(WIN32)
|
||||
|
||||
|
6
Jenkinsfile
vendored
6
Jenkinsfile
vendored
@ -131,11 +131,11 @@ def buildStaticBinaries() {
|
||||
|
||||
def cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1"'
|
||||
if (platform == "i386") {
|
||||
cmakeFlags = 'CMAKE_ARGS="-DBUILD_32BIT=1 -DBUILD_STATIC=1"'
|
||||
cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1"'
|
||||
} else if (platform == "armel") {
|
||||
cmakeFlags = 'CMAKE_ARGS="-DBUILD_32BIT=1 -DBUILD_STATIC=1 -DBUILD_ARM_V5=1"'
|
||||
cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1 -DBUILD_ARM_V5=1"'
|
||||
} else if (platform == "armhf") {
|
||||
cmakeFlags = 'CMAKE_ARGS="-DBUILD_32BIT=1 -DBUILD_STATIC=1 -DBUILD_ARM_V6=1"'
|
||||
cmakeFlags = 'CMAKE_ARGS="-DBUILD_STATIC=1 -DBUILD_ARM_V6=1"'
|
||||
}
|
||||
|
||||
sh "${cmakeFlags} make"
|
||||
|
Loading…
x
Reference in New Issue
Block a user