[libcxx] r294116 - Remove CMake hack

[Eric Fiselier via cfe-commits]

Sorry about the breakage. I'm not sure what else to do.

The hack had been sitting there for more than a month IIRC.

Any advice for next time?

/Eric

On Thu, Feb 16, 2017 at 7:00 PM, Justin Bogner <mail at justinbogner.com>
wrote:

> Eric Fiselier via cfe-commits <cfe-commits at lists.llvm.org> writes:
> > Author: ericwf
> > Date: Sat Feb  4 19:19:02 2017
> > New Revision: 294116
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=294116&view=rev
> > Log:
> > Remove CMake hack
>
> FWIW, I just spent half an hour trying to figure out why a tree I hadn't
> built in a bit wouldn't build anymore, because it had LIBCXX_CXX_ABI=""
> in its cache. There isn't really a general "safe" timeframe to remove
> cmake variable upgrade hacks.
>
> > Modified:
> >     libcxx/trunk/CMakeLists.txt
> >
> > Modified: libcxx/trunk/CMakeLists.txt
> > URL:
> > http://llvm.org/viewvc/llvm-project/libcxx/trunk/
> CMakeLists.txt?rev=294116&r1=294115&r2=294116&view=diff
> > ============================================================
> ==================
> >
> > --- libcxx/trunk/CMakeLists.txt (original)
> > +++ libcxx/trunk/CMakeLists.txt Sat Feb  4 19:19:02 2017
> > @@ -107,15 +107,6 @@ 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 force LLVM buildbots to store
> > -# the fixed cache entry instead of the previous cache entry. This is
> needed
> > -# because some LLVM buildbots don't clear their cache. It will be
> removed
> > -# once all LLVM bots have been run.
> > -if (LIBCXX_CXX_ABI STREQUAL "")
> > -  set(LIBCXX_CXX_ABI "default" CACHE STRING
> > -      "Specify the C++ ABI library to use." FORCE)
> > -endif()
> > -
> >  # Setup the default options if LIBCXX_CXX_ABI is not specified.
> >  if (LIBCXX_CXX_ABI STREQUAL "default")
> >    find_path(
> >
> >
> > _______________________________________________
> > cfe-commits mailing list
> > cfe-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170216/e5a07ded/attachment.html>