[compiler-rt] r279090 - [CMake] Stop building eprintf library on Darwin
Chris Bieneman via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 18 11:13:21 PDT 2016
Thanks!
-Chris
> On Aug 18, 2016, at 11:04 AM, Hans Wennborg <hans at chromium.org> wrote:
>
> Merged in r279103.
>
> Cheers,
> Hans
>
> On Thu, Aug 18, 2016 at 11:01 AM, Chris Bieneman <beanz at apple.com> wrote:
>> Yes, sorry I apparently replied on the wrong thread. I really should have made the titles of the commits a little bit more different. Email is hard...
>>
>> Thanks,
>> -Chris
>>
>>> On Aug 18, 2016, at 10:38 AM, Hans Wennborg <hans at chromium.org> wrote:
>>>
>>> When you say "this", you mean r278988 right?
>>>
>>> On Thu, Aug 18, 2016 at 10:21 AM, Chris Bieneman <beanz at apple.com> wrote:
>>>> Hans,
>>>>
>>>> Can we pull this change into 3.9? It has sat on trunk overnight and I didn’t see any fallout. The corresponding compiler-rt change which I just committed is not needed on the branch as it is just non-essential cleanup.
>>>>
>>>> Thanks,
>>>> -Chris
>>>>
>>>>> On Aug 18, 2016, at 10:10 AM, Chris Bieneman via llvm-commits <llvm-commits at lists.llvm.org> wrote:
>>>>>
>>>>> Author: cbieneman
>>>>> Date: Thu Aug 18 12:10:55 2016
>>>>> New Revision: 279090
>>>>>
>>>>> URL: http://llvm.org/viewvc/llvm-project?rev=279090&view=rev
>>>>> Log:
>>>>> [CMake] Stop building eprintf library on Darwin
>>>>>
>>>>> In r278988 clang stopped using the eprintf library, so we should stop generating it too.
>>>>>
>>>>> Modified:
>>>>> compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake
>>>>>
>>>>> Modified: compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake
>>>>> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake?rev=279090&r1=279089&r2=279090&view=diff
>>>>> ==============================================================================
>>>>> --- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
>>>>> +++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Thu Aug 18 12:10:55 2016
>>>>> @@ -256,30 +256,6 @@ function(darwin_filter_builtin_sources o
>>>>> set(${output_var} ${intermediate} PARENT_SCOPE)
>>>>> endfunction()
>>>>>
>>>>> -function(darwin_add_eprintf_library)
>>>>> - cmake_parse_arguments(LIB
>>>>> - ""
>>>>> - ""
>>>>> - "CFLAGS"
>>>>> - ${ARGN})
>>>>> -
>>>>> - add_library(clang_rt.eprintf STATIC eprintf.c)
>>>>> - set_target_compile_flags(clang_rt.eprintf
>>>>> - -isysroot ${DARWIN_osx_SYSROOT}
>>>>> - ${DARWIN_osx_BUILTIN_MIN_VER_FLAG}
>>>>> - -arch i386
>>>>> - ${LIB_CFLAGS})
>>>>> - set_target_properties(clang_rt.eprintf PROPERTIES
>>>>> - OUTPUT_NAME clang_rt.eprintf${COMPILER_RT_OS_SUFFIX})
>>>>> - set_target_properties(clang_rt.eprintf PROPERTIES
>>>>> - OSX_ARCHITECTURES i386)
>>>>> - add_dependencies(builtins clang_rt.eprintf)
>>>>> - set_target_properties(clang_rt.eprintf PROPERTIES
>>>>> - ARCHIVE_OUTPUT_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR})
>>>>> - install(TARGETS clang_rt.eprintf
>>>>> - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR})
>>>>> -endfunction()
>>>>> -
>>>>> # Generates builtin libraries for all operating systems specified in ARGN. Each
>>>>> # OS library is constructed by lipo-ing together single-architecture libraries.
>>>>> macro(darwin_add_builtin_libraries)
>>>>> @@ -350,8 +326,6 @@ macro(darwin_add_builtin_libraries)
>>>>> endif()
>>>>> endforeach()
>>>>>
>>>>> - darwin_add_eprintf_library(CFLAGS ${CFLAGS})
>>>>> -
>>>>> # We put the x86 sim slices into the archives for their base OS
>>>>> foreach (os ${ARGN})
>>>>> if(NOT ${os} MATCHES ".*sim$")
>>>>>
>>>>>
>>>>> _______________________________________________
>>>>> llvm-commits mailing list
>>>>> llvm-commits at lists.llvm.org
>>>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>>
>>
More information about the llvm-commits
mailing list