[PATCH] D54612: [compiler-rt] Use exact spelling when building for default target

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added reviewers: beanz, mcgrathr, jakehehrlich.
Herald added subscribers: Sanitizers, llvm-commits, mgorny, dberris, srhines.

When building for default target only, use exact target spelling
when deriving the name for the per-target runtime directory. This
is necessary for AArch32 where the CMake build by default rewrites
the architecture which leads to unexpected results.


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D54612

Files:
  compiler-rt/cmake/Modules/CompilerRTUtils.cmake


Index: compiler-rt/cmake/Modules/CompilerRTUtils.cmake
===================================================================
--- compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -337,7 +337,9 @@
 function(get_compiler_rt_target arch variable)
   string(FIND ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} "-" dash_index)
   string(SUBSTRING ${COMPILER_RT_DEFAULT_TARGET_TRIPLE} ${dash_index} -1 triple_suffix)
-  if(ANDROID AND ${arch} STREQUAL "i386")
+  if(COMPILER_RT_DEFAULT_TARGET_ONLY)
+    set(target "${COMPILER_RT_DEFAULT_TARGET_TRIPLE}")
+  elseif(ANDROID AND ${arch} STREQUAL "i386")
     set(target "i686${COMPILER_RT_OS_SUFFIX}${triple_suffix}")
   else()
     set(target "${arch}${triple_suffix}")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54612.174317.patch
Type: text/x-patch
Size: 754 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181116/c3236533/attachment.bin>