Browse Source
fix patch, use unix endings
Signed-off-by: crueter <crueter@crueter.xyz>
pull/348/head
crueter
6 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
35 additions and
35 deletions
-
.patch/boost/0003-armasm-options.patch
|
|
@ -1,12 +1,12 @@ |
|
|
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
|
|
|
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
|
|
|
index d6be702..0e59dd7 100644
|
|
|
|
|
|
|
|
|
index 8210f65..0e59dd7 100644
|
|
|
--- a/libs/context/CMakeLists.txt
|
|
|
--- a/libs/context/CMakeLists.txt
|
|
|
+++ b/libs/context/CMakeLists.txt
|
|
|
+++ b/libs/context/CMakeLists.txt
|
|
|
@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
|
|
|
@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
|
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh") |
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh") |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
|
|
|
- elseif() # masm
|
|
|
|
|
|
|
|
|
- else() # masm
|
|
|
+ # armasm doesn't support most of these options
|
|
|
+ # armasm doesn't support most of these options
|
|
|
+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
|
|
|
+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
|
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") |
|
|
|
