Merge pull request #1848 from majestrate/fixup-2022-02-02

fixup cross targets
2 years ago · fbb0ed8245
parent d66364ab7c 48559bd282
commit fbb0ed8245
3 changed files with 8 additions and 0 deletions
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@ -253,6 +253,12 @@ if(CMAKE_CROSSCOMPILING)
  elseif(ARCH_TRIPLET STREQUAL aarch64-linux-gnu)
    # cross compile arm64
    set(openssl_system_env SYSTEM=Linux MACHINE=aarch64)
+  elseif(ARCH_TRIPLET MATCHES arm-linux)
+    # cross compile armhf
+    set(openssl_system_env SYSTEM=Linux MACHINE=armv4)
+  elseif(ARCH_TRIPLET MATCHES powerpc64le)
+    # cross compile ppc64le
+    set(openssl_system_env SYSTEM=Linux MACHINE=ppc64le)
  endif()
 elseif(CMAKE_C_FLAGS MATCHES "-march=armv7")
  # Help openssl figure out that we're building from armv7 even if on armv8 hardware:
--- a/contrib/cross/armhf.toolchain.cmake
+++ b/contrib/cross/armhf.toolchain.cmake
@ -10,3 +10,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

 set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${TOOLCHAIN_SUFFIX})
 set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${TOOLCHAIN_SUFFIX})
+set(ARCH_TRIPLET ${TOOLCHAIN_PREFIX})
--- a/contrib/cross/ppc64le.toolchain.cmake
+++ b/contrib/cross/ppc64le.toolchain.cmake
@ -10,3 +10,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

 set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc${TOOLCHAIN_SUFFIX})
 set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++${TOOLCHAIN_SUFFIX})
+set(ARCH_TRIPLET ${TOOLCHAIN_PREFIX})