From ee53f056ce7360b9d81018d87ae7fd9864cd44d8 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 23 Jun 2020 16:29:35 -0700 Subject: [PATCH] fix flags --- CMakeLists.txt | 12 ++++++------ Jenkinsfile | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cdc35fc4..e83164f91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Jenkinsfile b/Jenkinsfile index f11a0510a..020c2a187 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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"