[libcxx-commits] [libcxx] r373385 - [libc++] Re-apply workaround for D63883

[Nico Weber via libcxx-commits]

Should the FIXME comment be updated then? It sounds like it contradicts the
commit message (?)

On Tue, Oct 1, 2019 at 3:25 PM Louis Dionne via libcxx-commits <
libcxx-commits at lists.llvm.org> wrote:

> Author: ldionne
> Date: Tue Oct  1 12:27:38 2019
> New Revision: 373385
>
> URL: http://llvm.org/viewvc/llvm-project?rev=373385&view=rev
> Log:
> [libc++] Re-apply workaround for D63883
>
> In reality, this workaround is for the fact that LIBCXX_CXX_ABI=libcxxabi
> can't be specified on Linux, since libc++abi isn't shipped with the system.
> Since the build bots explicitly specify LIBCXX_CXX_ABI=libcxxabi, they fail
> unless we apply the workaround.
>
> Modified:
>     libcxx/trunk/CMakeLists.txt
>
> Modified: libcxx/trunk/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=373385&r1=373384&r2=373385&view=diff
>
> ==============================================================================
> --- libcxx/trunk/CMakeLists.txt (original)
> +++ libcxx/trunk/CMakeLists.txt Tue Oct  1 12:27:38 2019
> @@ -148,6 +148,16 @@ set(LIBCXX_CXX_ABI "default" CACHE STRIN
>  set(CXXABIS none default libcxxabi libcxxrt libstdc++ libsupc++ vcruntime)
>  set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS})
>
> +# FIXME: This is a temporary hack to get the buildbots working while
> D63883 is in flight.
> +# Without this all the bots fail while building libc++
> +if (DEFINED ENV{USER})
> +  if (("$ENV{USER}" STREQUAL "buildbot") OR (("$ENV{USER}" STREQUAL
> "llvmbb") OR ("$ENV{USER}" STREQUAL "buildslave")))
> +    if (LIBCXX_CXX_ABI STREQUAL "libcxxabi" AND NOT DEFINED
> LIBCXX_CXX_ABI_INCLUDE_PATHS)
> +      message(WARNING "OVERRIDING BUILDBOT CONFIG")
> +      set(LIBCXX_CXX_ABI "default" CACHE STRING "FIXME" FORCE)
> +    endif()
> +  endif()
> +endif()
>  # Setup the default options if LIBCXX_CXX_ABI is not specified.
>  if (LIBCXX_CXX_ABI STREQUAL "default")
>    find_path(
>
>
> _______________________________________________
> libcxx-commits mailing list
> libcxx-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/libcxx-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20200207/b0f125bc/attachment.html>