diff --git a/crypto/XKCP/CMakeLists.txt b/crypto/XKCP/CMakeLists.txt index 6e221138c51bf1c19de2b6c89a6ad09e41f73192..8a5df4b8454ae69bbebb6fefcfe489ad56865215 100644 --- a/crypto/XKCP/CMakeLists.txt +++ b/crypto/XKCP/CMakeLists.txt @@ -65,6 +65,7 @@ message("[*] XKCP target: ${TARGET_ARCH} ${XKCP_TARGET}") message("[*] XKCP build dir: ${XKCP_BUILD_DIR}") message("[*] XKCP make command: ${MAKE}") message("[*] XKCP make CC: ${CMAKE_C_COMPILER}") +message("[*] XKCP make COMPILER_TARGET: ${CMAKE_C_COMPILER_TARGET}") message("[*] XKCP make AR: ${CMAKE_AR}") message("[*] XKCP compiller supports -march=native: ${COMPILER_SUPPORTS_MARCH_NATIVE}") message("[*] XKCP SYSROOT: ${CMAKE_OSX_SYSROOT}") @@ -74,8 +75,16 @@ SET(XKCP_BUILD_LIB ${XKCP_BUILD_DIR}/bin/${XKCP_TARGET}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${XKCP_BUILD_DIR}) +if (CMAKE_C_COMPILER_TARGET) + set(MAKE_C_FLAGS "--target=${CMAKE_C_COMPILER_TARGET} ${CMAKE_C_FLAGS} ") +else() + set(MAKE_C_FLAGS "${CMAKE_C_FLAGS}") +endif() + +message("[*] XKCP CFLAGS: ${MAKE_C_FLAGS}") + add_custom_target(BuildXKCP ALL - COMMAND ${CMAKE_COMMAND} -E env AR=${CMAKE_AR} CC=${CMAKE_C_COMPILER} SDKROOT=${CMAKE_OSX_SYSROOT} ${MAKE} -C ./xkcp_build_src ${XKCP_TARGET} + COMMAND ${CMAKE_COMMAND} -E env AR=${CMAKE_AR} CC=${CMAKE_C_COMPILER} CFLAGS=${MAKE_C_FLAGS} SDKROOT=${CMAKE_OSX_SYSROOT} ${MAKE} -C ./xkcp_build_src ${XKCP_TARGET} BYPRODUCTS ${XKCP_BUILD_LIB} ) diff --git a/crypto/XKCP/libdap-xkcp-armv8.build b/crypto/XKCP/libdap-xkcp-armv8.build index ee8a334f7006878edb4781e3151dda8a8cdabfec..9cc2c068271a58eb0a9408da56b777f75f38493f 100644 --- a/crypto/XKCP/libdap-xkcp-armv8.build +++ b/crypto/XKCP/libdap-xkcp-armv8.build @@ -1,5 +1,5 @@ <?xml version="1.0"?> <group> <target name="libdap-XKCP-armv8.a" inherits="FIPS202 K1600-plain-64bits-lcua"/> - <target name="libdap-XKCP-armv8-native.a" inherits="FIPS202 K1600-plain-64bits-lcua optimized-march-native"/> + <target name="libdap-XKCP-armv8-native.a" inherits="FIPS202 K1600-plain-64bits-lcua"/> </group> \ No newline at end of file