[compiler-rt] 926c147 - Revert "build: always add support for assembly targets on Darwin"
Francis Visoiu Mistrih via llvm-commits
llvm-commits at lists.llvm.org
Wed Jul 29 15:44:53 PDT 2020
Author: Francis Visoiu Mistrih
Date: 2020-07-29T15:41:04-07:00
New Revision: 926c14798d317a8c60592f420bb79cd80c150285
URL: https://github.com/llvm/llvm-project/commit/926c14798d317a8c60592f420bb79cd80c150285
DIFF: https://github.com/llvm/llvm-project/commit/926c14798d317a8c60592f420bb79cd80c150285.diff
LOG: Revert "build: always add support for assembly targets on Darwin"
This reverts commit d8e8e32d85f1cbde2a6b67af010fba3c3a3c86e9.
This breaks the build on GreenDragon:
http://green.lab.llvm.org/green/job/clang-stage1-RA/13171/console
Added:
Modified:
compiler-rt/cmake/Modules/AddCompilerRT.cmake
Removed:
################################################################################
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 9c135ef931a0..efb660818270 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -110,7 +110,7 @@ endfunction()
function(add_asm_sources output)
set(${output} ${ARGN} PARENT_SCOPE)
# Xcode will try to compile asm files as C ('clang -x c'), and that will fail.
- if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+ if (${CMAKE_GENERATOR} STREQUAL "Xcode")
enable_language(ASM)
else()
# Pass ASM file directly to the C++ compiler.
More information about the llvm-commits
mailing list