From 94763de52b947fbf7a6360f9dfc1e7b3363a9492 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Tue, 25 Apr 2023 11:47:02 +0200 Subject: Disable assembly on macos for now --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7847830..e05221c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,7 @@ if(ENABLE_ASM) endif() add_definitions(-DHAVE_GNU_STACK) elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") - set(HOST_ASM_MACOSX_X86_64 true) + set(ENABLE_ASM false) elseif(MSVC AND ("${CMAKE_GENERATOR}" MATCHES "Win64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64")) set(HOST_ASM_MASM_X86_64 true) ENABLE_LANGUAGE(ASM_MASM) diff --git a/configure.ac b/configure.ac index 51e096b..6fe2ff4 100644 --- a/configure.ac +++ b/configure.ac @@ -122,7 +122,7 @@ AM_CONDITIONAL([HOST_ASM_ELF_MIPS64], AM_CONDITIONAL([HOST_ASM_ELF_X86_64], [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], - [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) + [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" == "xenabled"]) AM_CONDITIONAL([HOST_ASM_MASM_X86_64], [test "x$HOST_ABI" = "xmasm" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) AM_CONDITIONAL([HOST_ASM_MINGW64_X86_64], -- cgit v1.2.3-55-g6feb