Merged to 7.0 in r339850.
On Tue, Aug 14, 2018 at 7:33 PM, Martin Storsjo via cfe-commits <cfe-commits@lists.llvm.org> wrote: > Author: mstorsjo > Date: Tue Aug 14 10:33:10 2018 > New Revision: 339697 > > URL: http://llvm.org/viewvc/llvm-project?rev=339697&view=rev > Log: > [CMake] Fix the LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY option > > This option should be available if LIBCXX_ENABLE_SHARED is enabled, > not LIBCXX_ENABLE_STATIC. > > This fixes a typo from SVN r337814. > > Differential Revision: https://reviews.llvm.org/D50691 > > Modified: > libcxx/trunk/CMakeLists.txt > > Modified: libcxx/trunk/CMakeLists.txt > URL: > http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=339697&r1=339696&r2=339697&view=diff > ============================================================================== > --- libcxx/trunk/CMakeLists.txt (original) > +++ libcxx/trunk/CMakeLists.txt Tue Aug 14 10:33:10 2018 > @@ -175,7 +175,7 @@ cmake_dependent_option(LIBCXX_STATICALLY > > cmake_dependent_option(LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY > "Statically link the ABI library to shared library" ON > - "LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_ENABLE_STATIC" OFF) > + "LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_ENABLE_SHARED" OFF) > > # Generate and install a linker script inplace of libc++.so. The linker > script > # will link libc++ to the correct ABI library. This option is on by default > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
