From 524f5ee186f95a0dc0dc449e437910a72b175893 Mon Sep 17 00:00:00 2001
From: Florent Castelli <florent.castelli@gmail.com>
Date: Fri, 6 Jan 2017 23:33:37 +0100
Subject: Android: Set compiler target platform when compiling ASM with Clang

Closes: #16535
---
 Modules/Platform/Android-Clang-ASM.cmake | 2 ++
 Modules/Platform/Android-Clang.cmake     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 Modules/Platform/Android-Clang-ASM.cmake

diff --git a/Modules/Platform/Android-Clang-ASM.cmake b/Modules/Platform/Android-Clang-ASM.cmake
new file mode 100644
index 0000000..6448da6
--- /dev/null
+++ b/Modules/Platform/Android-Clang-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/Android-Clang)
+__android_compiler_clang(ASM)
diff --git a/Modules/Platform/Android-Clang.cmake b/Modules/Platform/Android-Clang.cmake
index f0cf4a5..f739ab1 100644
--- a/Modules/Platform/Android-Clang.cmake
+++ b/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()
-- 
cgit v0.12