diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-07-26 04:04:02 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-07-26 04:04:02 +0000 |
| commit | 7618240aa9037bd5e56dcc62c459d72b3ecd7e83 (patch) | |
| tree | c53866f36a231ee8f9cda20106d92c70d6f98dab | |
| parent | 93efc78a0467dc9cd9964153e08f8d28ea14919d (diff) | |
builtins: re-enable building assembly sources
Re-apply SVN r213684 which was reverted in SVN r213724 since it broke the
build bots. Add a tweak to enable inclusion of the assembly sources in
standalone build as well.
Original commit message:
This patch address the PR20360. The CMake assembler build system
ignores the .S assembly files in builtins library build. This patch
fixes the issue.
llvm-svn: 214013
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/builtins/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index f35a096126ec..78413b0031ef 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -9,7 +9,7 @@ # Check if compiler-rt is built as a standalone project. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(CompilerRT) + project(CompilerRT ASM C CXX) set(COMPILER_RT_STANDALONE_BUILD TRUE) else() set(COMPILER_RT_STANDALONE_BUILD FALSE) diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index 054ff59b2a44..6289cdd18f07 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -251,6 +251,7 @@ add_custom_target(builtins) if (NOT WIN32) foreach(arch x86_64 i386 arm) if(CAN_TARGET_${arch}) + set_source_files_properties(${${arch}_SOURCES} PROPERTIES LANGUAGE C) add_compiler_rt_runtime(clang_rt.builtins-${arch} ${arch} STATIC SOURCES ${${arch}_SOURCES} CFLAGS "-std=c99") |