Browse Source

Android: Set compiler target platform when compiling ASM with Clang

Closes: #16535
Florent Castelli 9 years ago
parent
commit
524f5ee186
2 changed files with 5 additions and 1 deletions
  1. 2 0
      Modules/Platform/Android-Clang-ASM.cmake
  2. 3 1
      Modules/Platform/Android-Clang.cmake

+ 2 - 0
Modules/Platform/Android-Clang-ASM.cmake

@@ -0,0 +1,2 @@
+include(Platform/Android-Clang)
+__android_compiler_clang(ASM)

+ 3 - 1
Modules/Platform/Android-Clang.cmake

@@ -35,7 +35,9 @@ include(Platform/Android-Common)
 include(Platform/Android/abi-${CMAKE_ANDROID_ARCH_ABI}-Clang)
 
 macro(__android_compiler_clang lang)
-  __android_compiler_common(${lang})
+  if(NOT "x${lang}" STREQUAL "xASM")
+    __android_compiler_common(${lang})
+  endif()
   if(NOT CMAKE_${lang}_COMPILER_TARGET)
     set(CMAKE_${lang}_COMPILER_TARGET "${_ANDROID_ABI_CLANG_TARGET}")
   endif()