[ros-diffs] [reactos] 01/02: [MVDM] Use again the correct CMAKE_C_COMPILER to pre-process the ASM code (addendum to 09c06a2f).

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19f6fc2525cb27dfb2224…

commit 19f6fc2525cb27dfb22246d72eb6be30193a97a3
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Jan 27 01:44:21 2019 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Jan 27 02:40:10 2019 +0100

    [MVDM] Use again the correct CMAKE_C_COMPILER to pre-process the ASM code (addendum to
09c06a2f).
---
 subsystems/mvdm/asm16.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake
index 4aea5f884b..8cc77dd1d5 100644
--- a/subsystems/mvdm/asm16.cmake
+++ b/subsystems/mvdm/asm16.cmake
@@ -106,10 +106,15 @@ function(add_asm16_bin _target _binary_file _base_address)
         set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp
/Fo${_object_file} /c /Ta ${_preprocessed_asm_file})
     endif()
 
-    # FIXME: clang-cl can't compile this so use cl here instead of
${CMAKE_C_COMPILER} in the meantime
+    if(USE_CLANG_CL)
+        set(_no_std_includes_flag "-nostdinc")
+    else()
+        set(_no_std_includes_flag "/X")
+    endif()
+
     add_custom_command(
         OUTPUT ${_preprocessed_asm_file} ${_object_file}
-        COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm
/I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines}
${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} >
${_preprocessed_asm_file} && ${_pp_asm16_compile_command}
+        COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag}
/I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm
${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML
/EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} &&
${_pp_asm16_compile_command}
         DEPENDS ${_concatenated_asm_file})
 
     add_custom_command(