Author: hans Date: Thu Aug 16 02:03:32 2018 New Revision: 339850 URL: http://llvm.org/viewvc/llvm-project?rev=339850&view=rev Log: Merging r339697: ------------------------------------------------------------------------ r339697 | mstorsjo | 2018-08-14 19:33:10 +0200 (Tue, 14 Aug 2018) | 8 lines
[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/branches/release_70/ (props changed) libcxx/branches/release_70/CMakeLists.txt Propchange: libcxx/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 16 02:03:32 2018 @@ -1,2 +1,2 @@ /libcxx/branches/apple:136569-137939 -/libcxx/trunk:339431 +/libcxx/trunk:339431,339697 Modified: libcxx/branches/release_70/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/CMakeLists.txt?rev=339850&r1=339849&r2=339850&view=diff ============================================================================== --- libcxx/branches/release_70/CMakeLists.txt (original) +++ libcxx/branches/release_70/CMakeLists.txt Thu Aug 16 02:03:32 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
