From f96a9f63eacf40626cda733d2ab5ab2ebb3506e6 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 23 Jun 2020 08:53:13 -0700 Subject: [PATCH] . --- CMakeLists.txt | 8 ++++++++ Jenkinsfile | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 900b6237e..7437026bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,6 +236,14 @@ if(NOT PACKAGE_STATIC) add_dependencies(zerotier zt_osdep zt_core zt_controller zt_service_io_core) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zerotier DESTINATION bin) else(NOT PACKAGE_STATIC) + if(BUILD_32BIT) + set(CMAKE_SYSTEM_PROCESSOR "x86" CACHE STRING "system processor") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "c++ flags") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "c flags") + add_compile_options( + -m32 + ) + endif(BUILD_32BIT) set(STATIC_BINARY ${CMAKE_BINARY_DIR}/zerotier) set(IMPORTED_LOCATION ${CMAKE_BINARY_DIR}) add_executable(zerotier IMPORTED GLOBAL) diff --git a/Jenkinsfile b/Jenkinsfile index 106b3cbc2..c19be7e05 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -180,7 +180,7 @@ def packageStatic() { unstash "static-${arch}" sh "mkdir -p build" sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" - sh 'CMAKE_ARGS="-DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup' + sh 'CMAKE_ARGS="-DBUILD_32BIT=1 -DPACKAGE_STATIC=1 -DZT_PACKAGE_FORMAT=RPM" make setup' dir("build") { sh 'make package' }