eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

fix clang, armasm

Browse source 
Signed-off-by: crueter <crueter@crueter.xyz>
This commit is contained in:
crueter 2025-09-08 10:22:05 -04:00 • committed by crueter
parent d21405269e
commit eb96bd6dc4
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.patch/boost/0003-armasm-options.patch
View file

@ -1,13 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8210f65..108ac88 100644
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
index d6be702..0e59dd7 100644
--- a/libs/context/CMakeLists.txt
+++ b/libs/context/CMakeLists.txt
@@ -174,7 +174,7 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
set(IMPL_SOURCES ${ASM_SOURCES} src/fcontext.cpp)
- if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm)
+ if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm OR BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/nologo")
@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
endif()
- elseif() # masm
+ # armasm doesn't support most of these options
+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

1
src/core/CMakeLists.txt
View file

@ -1187,6 +1187,7 @@ else()
-Wno-cast-function-type
$<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
$<$<CXX_COMPILER_ID:Clang>:-Wno-cast-function-type-mismatch>
)
endif()