File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1322,13 +1322,22 @@ else(NOT CMAKE_CROSSCOMPILING)
13221322 file (MAKE_DIRECTORY ${GETARCH_DIR} )
13231323 configure_file (${TARGET_CONF_TEMP} ${GETARCH_DIR} /${TARGET_CONF} COPYONLY )
13241324 if (NOT "${CMAKE_SYSTEM_NAME} " STREQUAL "WindowsStore" )
1325- try_compile (GETARCH_RESULT ${GETARCH_DIR}
1326- SOURCES ${GETARCH_SRC}
1327- COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I "${GETARCH_DIR} " -I "${PROJECT_SOURCE_DIR} " -I "${PROJECT_BINARY_DIR} "
1328- OUTPUT_VARIABLE GETARCH_LOG
1329- COPY_FILE ${PROJECT_BINARY_DIR} /${GETARCH_BIN}
1330- )
1331-
1325+ if (CMAKE_ASM_COMPILER_ID STREQUAL "" )
1326+ try_compile (GETARCH_RESULT ${GETARCH_DIR}
1327+ SOURCES ${GETARCH_SRC}
1328+ CMAKE_FLAGS "-DCMAKE_ASM_COMPILER=${CMAKE_C_COMPILER} "
1329+ COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I "${GETARCH_DIR} " -I "${PROJECT_SOURCE_DIR} " -I "${PROJECT_BINARY_DIR} "
1330+ OUTPUT_VARIABLE GETARCH_LOG
1331+ COPY_FILE ${PROJECT_BINARY_DIR} /${GETARCH_BIN}
1332+ )
1333+ else ()
1334+ try_compile (GETARCH_RESULT ${GETARCH_DIR}
1335+ SOURCES ${GETARCH_SRC}
1336+ COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I "${GETARCH_DIR} " -I "${PROJECT_SOURCE_DIR} " -I "${PROJECT_BINARY_DIR} "
1337+ OUTPUT_VARIABLE GETARCH_LOG
1338+ COPY_FILE ${PROJECT_BINARY_DIR} /${GETARCH_BIN}
1339+ )
1340+ endif ()
13321341 if (NOT ${GETARCH_RESULT} )
13331342 MESSAGE (FATAL_ERROR "Compiling getarch failed ${GETARCH_LOG} " )
13341343 endif ()
You can’t perform that action at this time.
0 commit comments