loader: allow GAS on MinGW

Disabled by default, user must explicitly enable USE_GAS.

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 96e86ef6412775bb8b5b2282511be84e197e86f4..fba0fabf6553cffc3be58ef6fa0f52ce7fa9da00 100644 (file)
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -129,7 +129,7 @@ set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} extensions will suffer from a corrupted
 
 if (APPLE_UNIVERSAL_BINARY)
     set(USE_ASSEMBLY_FALLBACK ON)
-elseif(WIN32)
+elseif(WIN32 AND NOT USE_GAS)
     option(USE_MASM "Use MASM" ON)
     if(USE_MASM AND MINGW)
         find_program(JWASM_FOUND NAMES jwasm uasm)
@@ -215,7 +215,7 @@ end
         set(USE_ASSEMBLY_FALLBACK ON)
         message(WARNING "Could not find working MASM assembler\n${ASM_FAILURE_MSG}")
     endif()
-elseif(UNIX) # i.e.: Linux & Apple
+elseif(UNIX OR MINGW) # i.e.: Linux & Apple & MinGW
 
     option(USE_GAS "Use GAS" ON)
     if(USE_GAS)