Grant Limberg 5 years ago
parent
commit
f96a9f63ea
2 changed files with 9 additions and 1 deletions
  1. 8 0
      CMakeLists.txt
  2. 1 1
      Jenkinsfile

+ 8 - 0
CMakeLists.txt

@@ -236,6 +236,14 @@ if(NOT PACKAGE_STATIC)
 	add_dependencies(zerotier zt_osdep zt_core zt_controller zt_service_io_core)
 	add_dependencies(zerotier zt_osdep zt_core zt_controller zt_service_io_core)
 	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zerotier DESTINATION bin)
 	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zerotier DESTINATION bin)
 else(NOT PACKAGE_STATIC)
 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(STATIC_BINARY ${CMAKE_BINARY_DIR}/zerotier)
 	set(IMPORTED_LOCATION ${CMAKE_BINARY_DIR})
 	set(IMPORTED_LOCATION ${CMAKE_BINARY_DIR})
 	add_executable(zerotier IMPORTED GLOBAL)
 	add_executable(zerotier IMPORTED GLOBAL)

+ 1 - 1
Jenkinsfile

@@ -180,7 +180,7 @@ def packageStatic() {
                         unstash "static-${arch}"
                         unstash "static-${arch}"
                         sh "mkdir -p build"
                         sh "mkdir -p build"
                         sh "mv zerotier-static-${arch} build/zerotier && chmod +x build/zerotier" 
                         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") {
                         dir("build") {
                             sh 'make package'
                             sh 'make package'
                         }
                         }