<div dir="ltr">Trying the build now.<div><br></div><div>+Brad for a weird CMake issue. Looks like CMake is unable to detect CMAKE_CXX_COMPILER_VERSION if I pass trunk Clang as CMAKE_CXX_COMPILER, and pass "-fsanitize=thread" as CMAKE_CXX_FLAGS (Compiler identification is determined as "Clang" instead</div><div>of "Clang 3.8.0").</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jul 29, 2015 at 4:24 PM, Eric Fiselier <span dir="ltr"><<a href="mailto:eric@efcs.ca" target="_blank">eric@efcs.ca</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I just pushed a possible fix to libc++. Let me know ASAP if that<br>
doesn't fix the issue. I'll revert if r243591 doesn't work.<br>
<br>
/Eric<br>
<span class=""><br>
On Wed, Jul 29, 2015 at 6:44 PM, Alexey Samsonov <<a href="mailto:vonosmas@gmail.com">vonosmas@gmail.com</a>> wrote:<br>
> Eric,<br>
><br>
> Looks like it breaks the build of compiler-rt on Linux, and we can't fix it<br>
> instantly, sorry =/<br>
> Could you please revert it again?<br>
><br>
> The problem is that when I pass correct -DLLVM_CONFIG= value when<br>
> configuring standalone libcxx with<br>
> just-built Clang, libcxx invokes llvm/cmake/modules/HandleLLVMOptions.cmake,<br>
> and it fails with an error<br>
> "Host Clang version must be at least 3.1!",<br>
> because CMake is unable to properly determine the compiler version of<br>
> just-built Clang as 3.8.0 for<br>
> some reason(?!) I'm now looking into this issue, and will provide a patch to<br>
> compiler-rt that should accompany<br>
> re-land of libcxx CMake changes.<br>
><br>
</span><span class="">> On Wed, Jul 29, 2015 at 3:05 PM, Eric Fiselier <<a href="mailto:eric@efcs.ca">eric@efcs.ca</a>> wrote:<br>
>><br>
>> Libc++ standalone builds now require that libc++ can find the LLVM source<br>
>> directory. If you specify the LLVM source root using<br>
>> "-DLLVM_PATH=path/to/llvm" then the command should work?<br>
>><br>
>> Does this new requirement work for you?<br>
>><br>
</span><span class="">>> On Jul 29, 2015 6:03 PM, "Alexey Samsonov" <<a href="mailto:samsonov@google.com">samsonov@google.com</a>> wrote:<br>
>>><br>
>>> I'm looking into the fix now, it probably should go to compiler-rt<br>
>>> anyway, so I don't think we should revert libcxx part now.<br>
>>><br>
</span>>>> On Wed, Jul 29, 2015 at 2:59 PM, Kostya Serebryany <<a href="mailto:kcc@google.com">kcc@google.com</a>><br>
<span class="">>>> wrote:<br>
>>>><br>
>>>> Eric,<br>
>>>> If there is no quick fix, will you be able to revert this, please?<br>
>>>><br>
>>>> On Wed, Jul 29, 2015 at 2:56 PM, Evgenii Stepanov<br>
</span><span class="">>>>> <<a href="mailto:eugeni.stepanov@gmail.com">eugeni.stepanov@gmail.com</a>> wrote:<br>
>>>>><br>
>>>>> And the log says:<br>
>>>>><br>
>>>>> CMake Error at cmake/Modules/FindLLVM.cmake:41 (message):<br>
>>>>> llvm-config not found and LLVM_MAIN_SRC_DIR not defined. Reconfigure<br>
>>>>> with<br>
>>>>> -DLLVM_CONFIG=path/to/llvm-config or<br>
>>>>> -DLLVM_PATH=path/to/llvm-source-root.<br>
>>>>> Call Stack (most recent call first):<br>
>>>>> CMakeLists.txt:37 (include)<br>
>>>>><br>
</span>>>>>> On Wed, Jul 29, 2015 at 2:49 PM, Kostya Serebryany <<a href="mailto:kcc@google.com">kcc@google.com</a>><br>
<div><div class="h5">>>>>> wrote:<br>
>>>>> > I am seeing build failure when trying to run "ninja check-msan":<br>
>>>>> ><br>
>>>>> > [39/58] Performing configure step for 'libcxx_msan-with-call'<br>
>>>>> > FAILED: cd<br>
>>>>> ><br>
>>>>> > /usr/local/google/home/kcc/llvm-gcc-build/projects/compiler-rt/lib/msan/libcxx_msan-with-call/src/libcxx_msan-with-call-build<br>
>>>>> > && /usr/bin/cmake -P<br>
>>>>> ><br>
>>>>> > /usr/local/google/home/kcc/llvm-gcc-build/projects/compiler-rt/lib/msan/tests/../libcxx_msan-with-call/src/libcxx_msan-with-call-stamp/libcxx_msan-with-call-configure.cmake<br>
>>>>> > && /usr/bin/cmake -E touch<br>
>>>>> ><br>
>>>>> > /usr/local/google/home/kcc/llvm-gcc-build/projects/compiler-rt/lib/msan/tests/../libcxx_msan-with-call/src/libcxx_msan-with-call-stamp/libcxx_msan-with-call-configure<br>
>>>>> > CMake Error at<br>
>>>>> ><br>
>>>>> > /usr/local/google/home/kcc/llvm-gcc-build/projects/compiler-rt/lib/msan/libcxx_msan-with-call/src/libcxx_msan-with-call-stamp/libcxx_msan-with-call-configure.cmake:16<br>
>>>>> > (message):<br>
>>>>> > Command failed: 1<br>
>>>>> ><br>
>>>>> > '/usr/bin/cmake'<br>
>>>>> ><br>
>>>>> > '-DCMAKE_C_COMPILER=/usr/local/google/home/kcc/llvm-gcc-build/./bin/clang'<br>
>>>>> ><br>
>>>>> > '-DCMAKE_CXX_COMPILER=/usr/local/google/home/kcc/llvm-gcc-build/./bin/clang'<br>
>>>>> > '-DCMAKE_C_FLAGS= -fsanitize=memory -fsanitize-memory-track-origins<br>
>>>>> > -Wno-pedantic -fsanitize=memory -fsanitize-memory-track-origins<br>
>>>>> > -Wno-pedantic -mllvm -msan-instrumentation-with-call-threshold=0'<br>
>>>>> > '-DCMAKE_CXX_FLAGS= -fsanitize=memory -fsanitize-memory-track-origins<br>
>>>>> > -Wno-pedantic -fsanitize=memory -fsanitize-memory-track-origins<br>
>>>>> > -Wno-pedantic -mllvm -msan-instrumentation-with-call-threshold=0'<br>
>>>>> > '-DCMAKE_BUILD_TYPE=Release'<br>
>>>>> ><br>
>>>>> > '-DCMAKE_INSTALL_PREFIX:PATH=/usr/local/google/home/kcc/llvm-gcc-build/projects/compiler-rt/lib/msan/tests/../libcxx_msan-with-call'<br>
>>>>> > '-GNinja' '/usr/local/google/home/kcc/llvm/projects/libcxx'<br>
>>>>> ><br>
>>>>> > See also<br>
>>>>> ><br>
>>>>> ><br>
>>>>> ><br>
>>>>> > /usr/local/google/home/kcc/llvm-gcc-build/projects/compiler-rt/lib/msan/tests/../libcxx_msan-with-call/src/libcxx_msan-with-call-stamp/libcxx_msan-with-call-configure-*.log<br>
>>>>> ><br>
>>>>> ><br>
>>>>> > Looks like this is the only change that might have caused this.<br>
>>>>> ><br>
</div></div><span class="">>>>>> > On Wed, Jul 29, 2015 at 2:07 PM, Eric Fiselier <<a href="mailto:eric@efcs.ca">eric@efcs.ca</a>> wrote:<br>
>>>>> >><br>
>>>>> >> Author: ericwf<br>
>>>>> >> Date: Wed Jul 29 16:07:28 2015<br>
>>>>> >> New Revision: 243574<br>
>>>>> >><br>
</span>>>>>> >> URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D243574-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=QsHP3G8EQtCH_qiGfgbBNwq1CFziAFxP73E-UlHuMBo&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=243574&view=rev</a><br>
<span class="">>>>>> >> Log:<br>
>>>>> >> Recommit r243503 "[libcxx] Cleanup CMake configuration and integrate<br>
>>>>> >> with<br>
>>>>> >> LLVM"<br>
>>>>> >><br>
>>>>> >> This change was reverted in r243550 because it broke clang-format<br>
>>>>> >> builds<br>
>>>>> >> (see PR24306).<br>
>>>>> >><br>
>>>>> >> This patch recommits a fixed version of the original.<br>
>>>>> >><br>
>>>>> >> Added:<br>
>>>>> >> libcxx/trunk/cmake/Modules/FindLLVM.cmake<br>
>>>>> >> libcxx/trunk/cmake/Modules/HandleLibcxxFlags.cmake<br>
>>>>> >> Modified:<br>
>>>>> >> libcxx/trunk/CMakeLists.txt<br>
>>>>> >> libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake<br>
>>>>> >> libcxx/trunk/cmake/config-ix.cmake<br>
>>>>> >> libcxx/trunk/lib/CMakeLists.txt<br>
>>>>> >> libcxx/trunk/test/CMakeLists.txt<br>
</span><span class="">>>>>> >> libcxx/trunk/test/<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lit.site.cfg.in&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=5PPsZ9gbMn8lgH-mSWLdhM5Ntu6_V4-OkJBBvTWrg4w&e=" rel="noreferrer" target="_blank">lit.site.cfg.in</a><br>
>>>>> >> libcxx/trunk/www/index.html<br>
>>>>> >><br>
>>>>> >> Modified: libcxx/trunk/CMakeLists.txt<br>
>>>>> >> URL:<br>
>>>>> >><br>
</span><div><div class="h5">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_CMakeLists.txt-3Frev-3D243574-26r1-3D243573-26r2-3D243574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=s_Kpf5XAO2TWoFA-pCcgGAxjVs7Al6MM5TMrDSPWOVU&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=243574&r1=243573&r2=243574&view=diff</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/CMakeLists.txt (original)<br>
>>>>> >> +++ libcxx/trunk/CMakeLists.txt Wed Jul 29 16:07:28 2015<br>
>>>>> >> @@ -3,13 +3,16 @@<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> # Setup Project<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> -<br>
>>>>> >> -project(libcxx CXX C)<br>
>>>>> >> cmake_minimum_required(VERSION 2.8)<br>
>>>>> >><br>
>>>>> >> if(POLICY CMP0042)<br>
>>>>> >> cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default<br>
>>>>> >> endif()<br>
>>>>> >> +if(POLICY CMP0022)<br>
>>>>> >> + cmake_policy(SET CMP0022 NEW) # Required when interacting with<br>
>>>>> >> LLVM and<br>
>>>>> >> Clang<br>
>>>>> >> +endif()<br>
>>>>> >> +<br>
>>>>> >> +project(libcxx CXX C)<br>
>>>>> >><br>
>>>>> >> set(PACKAGE_NAME libcxx)<br>
>>>>> >> set(PACKAGE_VERSION trunk-svn)<br>
>>>>> >> @@ -30,52 +33,90 @@ MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<br>
>>>>> >> build directory and run 'cmake /path/to/${PROJECT_NAME} [options]'<br>
>>>>> >> there."<br>
>>>>> >> )<br>
>>>>> >><br>
>>>>> >> -if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
>>>>> >> - set(LIBCXX_LIBDIR_SUFFIX "" CACHE STRING<br>
>>>>> >> - "Define suffix of library directory name (32/64)")<br>
>>>>> >> -<br>
>>>>> >> - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY<br>
>>>>> >> ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})<br>
>>>>> >> - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY<br>
>>>>> >> ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})<br>
>>>>> >> -<br>
>>>>> >> - set(LIBCXX_BUILT_STANDALONE 1)<br>
>>>>> >> -else()<br>
>>>>> >> - set(LIBCXX_LIBDIR_SUFFIX ${LLVM_LIBDIR_SUFFIX})<br>
>>>>> >> -endif()<br>
>>>>> >> +# Find the required bits of LLVM<br>
>>>>> >> +include(FindLLVM)<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> # Setup CMake Options<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >><br>
>>>>> >> -# Define options.<br>
>>>>> >> -option(LIBCXX_ENABLE_EXCEPTIONS "Use exceptions." ON)<br>
>>>>> >> -option(LIBCXX_ENABLE_RTTI "Use run time type information." ON)<br>
>>>>> >> +# Basic options<br>
>>>>> >> ---------------------------------------------------------------<br>
>>>>> >> option(LIBCXX_ENABLE_ASSERTIONS "Enable assertions independent of<br>
>>>>> >> build<br>
>>>>> >> mode." ON)<br>
>>>>> >> -option(LIBCXX_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)<br>
>>>>> >> -option(LIBCXX_ENABLE_WERROR "Fail and stop if a warning is<br>
>>>>> >> triggered."<br>
>>>>> >> OFF)<br>
>>>>> >> -option(LIBCXX_ENABLE_CXX1Y "Enable -std=c++1y and use of c++1y<br>
>>>>> >> language<br>
>>>>> >> features if the compiler supports it." OFF)<br>
>>>>> >> option(LIBCXX_ENABLE_SHARED "Build libc++ as a shared library." ON)<br>
>>>>> >> +<br>
>>>>> >> +set(LIBCXX_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING<br>
>>>>> >> + "Define suffix of library directory name (32/64)")<br>
>>>>> >> +option(LIBCXX_INSTALL_HEADERS "Install the libc++ headers." ON)<br>
>>>>> >> +option(LIBCXX_INSTALL_SUPPORT_HEADERS "Install libc++ support<br>
>>>>> >> headers."<br>
>>>>> >> ON)<br>
>>>>> >> +<br>
>>>>> >> +# ABI Library options<br>
>>>>> >> ---------------------------------------------------------<br>
>>>>> >> +set(LIBCXX_CXX_ABI "${LIBCXX_CXX_ABI}" CACHE STRING<br>
>>>>> >> + "Specify C++ ABI library to use." FORCE)<br>
>>>>> >> +set(CXXABIS none libcxxabi libcxxrt libstdc++ libsupc++)<br>
>>>>> >> +set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS})<br>
>>>>> >> +<br>
>>>>> >> +option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "Statically link the ABI<br>
>>>>> >> library"<br>
>>>>> >> OFF)<br>
>>>>> >> +<br>
>>>>> >> +# Build libc++abi with libunwind. We need this option to determine<br>
>>>>> >> whether to<br>
>>>>> >> +# link with libunwind or libgcc_s while running the test cases.<br>
>>>>> >> +option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM<br>
>>>>> >> unwinder."<br>
>>>>> >> OFF)<br>
>>>>> >> +<br>
>>>>> >> +# Target options<br>
>>>>> >> --------------------------------------------------------------<br>
>>>>> >> +option(LIBCXX_BUILD_32_BITS "Build 32 bit libc++." OFF)<br>
>>>>> >> +set(LIBCXX_SYSROOT "" CACHE STRING "Use alternate sysroot.")<br>
>>>>> >> +set(LIBCXX_GCC_TOOLCHAIN "" CACHE STRING "Use alternate GCC<br>
>>>>> >> toolchain.")<br>
>>>>> >> +<br>
>>>>> >> +# Feature options<br>
>>>>> >> -------------------------------------------------------------<br>
>>>>> >> +option(LIBCXX_ENABLE_EXCEPTIONS "Use exceptions." ON)<br>
>>>>> >> +option(LIBCXX_ENABLE_RTTI "Use run time type information." ON)<br>
>>>>> >> option(LIBCXX_ENABLE_GLOBAL_FILESYSTEM_NAMESPACE "Build libc++ with<br>
>>>>> >> support for the global filesystem namespace." ON)<br>
>>>>> >> option(LIBCXX_ENABLE_STDIN "Build libc++ with support for<br>
>>>>> >> stdin/std::cin." ON)<br>
>>>>> >> option(LIBCXX_ENABLE_STDOUT "Build libc++ with support for<br>
>>>>> >> stdout/std::cout." ON)<br>
>>>>> >> option(LIBCXX_ENABLE_THREADS "Build libc++ with support for<br>
>>>>> >> threads." ON)<br>
>>>>> >> option(LIBCXX_ENABLE_THREAD_UNSAFE_C_FUNCTIONS "Build libc++ with<br>
>>>>> >> support<br>
>>>>> >> for thread-unsafe C functions" ON)<br>
>>>>> >> -option(LIBCXX_BUILD_32_BITS "Build 32 bit libc++" OFF)<br>
>>>>> >> option(LIBCXX_ENABLE_MONOTONIC_CLOCK<br>
>>>>> >> "Build libc++ with support for a monotonic clock.<br>
>>>>> >> This option may only be used when LIBCXX_ENABLE_THREADS=OFF."<br>
>>>>> >> ON)<br>
>>>>> >> -option(LIBCXX_INSTALL_HEADERS "Install the libc++ headers." ON)<br>
>>>>> >> -option(LIBCXX_INSTALL_SUPPORT_HEADERS "Install libc++ support<br>
>>>>> >> headers."<br>
>>>>> >> ON)<br>
>>>>> >> +<br>
>>>>> >> +# Misc options<br>
>>>>> >> ----------------------------------------------------------------<br>
>>>>> >> +option(LIBCXX_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)<br>
>>>>> >> +option(LIBCXX_ENABLE_WERROR "Fail and stop if a warning is<br>
>>>>> >> triggered."<br>
>>>>> >> OFF)<br>
>>>>> >> +<br>
>>>>> >> option(LIBCXX_GENERATE_COVERAGE "Enable generating code coverage."<br>
>>>>> >> OFF)<br>
>>>>> >> set(LIBCXX_COVERAGE_LIBRARY "" CACHE STRING<br>
>>>>> >> - "The Profile-rt library used to build with code coverage")<br>
>>>>> >> -option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "Statically link the ABI<br>
>>>>> >> library"<br>
>>>>> >> OFF)<br>
>>>>> >> -set(LIBCXX_SYSROOT "" CACHE STRING "Use alternate sysroot.")<br>
>>>>> >> -set(LIBCXX_GCC_TOOLCHAIN "" CACHE STRING "Use alternate GCC<br>
>>>>> >> toolchain.")<br>
>>>>> >> -if (LIBCXX_BUILT_STANDALONE)<br>
>>>>> >> - set(LLVM_USE_SANITIZER "" CACHE STRING<br>
>>>>> >> - "Define the sanitizer used to build the library and tests")<br>
>>>>> >> + "The Profile-rt library used to build with code coverage")<br>
>>>>> >> +<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> +#===============================================================================<br>
>>>>> >> +# Check option configurations<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> +#===============================================================================<br>
>>>>> >> +<br>
>>>>> >> +# Ensure LIBCXX_ENABLE_MONOTONIC_CLOCK is set to ON only when<br>
>>>>> >> +# LIBCXX_ENABLE_THREADS is on.<br>
>>>>> >> +if(LIBCXX_ENABLE_THREADS AND NOT LIBCXX_ENABLE_MONOTONIC_CLOCK)<br>
>>>>> >> + message(FATAL_ERROR "LIBCXX_ENABLE_MONOTONIC_CLOCK can only be<br>
>>>>> >> set to<br>
>>>>> >> OFF"<br>
>>>>> >> + " when LIBCXX_ENABLE_THREADS is also set to<br>
>>>>> >> OFF.")<br>
>>>>> >> +endif()<br>
>>>>> >> +<br>
>>>>> >> +# Ensure LLVM_USE_SANITIZER is not specified when<br>
>>>>> >> LIBCXX_GENERATE_COVERAGE<br>
>>>>> >> +# is ON.<br>
>>>>> >> +if (LLVM_USE_SANITIZER AND LIBCXX_GENERATE_COVERAGE)<br>
>>>>> >> + message(FATAL_ERROR "LLVM_USE_SANITIZER cannot be used with<br>
>>>>> >> LIBCXX_GENERATE_COVERAGE")<br>
>>>>> >> +endif()<br>
>>>>> >> +<br>
>>>>> >> +# Set LIBCXX_BUILD_32_BITS to (LIBCXX_BUILD_32_BITS OR<br>
>>>>> >> LLVM_BUILD_32_BITS)<br>
>>>>> >> +# and check that we can build with 32 bits if requested.<br>
>>>>> >> +if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32)<br>
>>>>> >> + if (LIBCXX_BUILD_32_BITS OR LLVM_BUILD_32_BITS)<br>
>>>>> >> + if (NOT LLVM_BUILD_32_BITS) # Don't duplicate the output from<br>
>>>>> >> LLVM<br>
>>>>> >> + message(STATUS "Building 32 bits executables and libraries.")<br>
>>>>> >> + endif()<br>
>>>>> >> + set(LIBCXX_BUILD_32_BITS ON CACHE BOOL "" FORCE)<br>
>>>>> >> + endif()<br>
>>>>> >> +elseif(LIBCXX_BUILD_32_BITS)<br>
>>>>> >> + message(FATAL_ERROR "LIBCXX_BUILD_32_BITS=ON is not supported on<br>
>>>>> >> this<br>
>>>>> >> platform.")<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> +# Check that this option is not enabled on Apple and emit a usage<br>
>>>>> >> warning.<br>
>>>>> >> if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)<br>
>>>>> >> if (APPLE)<br>
>>>>> >> message(FATAL_ERROR "LIBCXX_ENABLE_STATIC_ABI_LIBRARY is not<br>
>>>>> >> supported on OS X")<br>
>>>>> >> @@ -84,27 +125,6 @@ if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)<br>
>>>>> >> endif()<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> -set(CXXABIS none libcxxabi libcxxrt libstdc++ libsupc++)<br>
>>>>> >> -if (NOT LIBCXX_CXX_ABI)<br>
>>>>> >> - if (NOT DEFINED LIBCXX_BUILT_STANDALONE AND<br>
>>>>> >> - IS_DIRECTORY "${CMAKE_SOURCE_DIR}/projects/libcxxabi")<br>
>>>>> >> - set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi")<br>
>>>>> >> - set(LIBCXX_CXX_ABI_INCLUDE_PATHS<br>
>>>>> >> "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include")<br>
>>>>> >> - set(LIBCXX_CXX_ABI_INTREE 1)<br>
>>>>> >> - else ()<br>
>>>>> >> - set(LIBCXX_CXX_ABI_LIBNAME "none")<br>
>>>>> >> - endif ()<br>
>>>>> >> -else ()<br>
>>>>> >> - set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}")<br>
>>>>> >> -endif ()<br>
>>>>> >> -set(LIBCXX_CXX_ABI "${LIBCXX_CXX_ABI}" CACHE STRING<br>
>>>>> >> - "Specify C++ ABI library to use." FORCE)<br>
>>>>> >> -set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS})<br>
>>>>> >> -<br>
>>>>> >> -# Build libc++abi with libunwind. We need this option to determine<br>
>>>>> >> whether to<br>
>>>>> >> -# link with libunwind or libgcc_s while running the test cases.<br>
>>>>> >> -option(LIBCXXABI_USE_LLVM_UNWINDER "Build and use the LLVM<br>
>>>>> >> unwinder."<br>
>>>>> >> OFF)<br>
>>>>> >> -<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> # Configure System<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> @@ -114,234 +134,113 @@ set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_S<br>
>>>>> >> set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})<br>
>>>>> >> set(LIBCXX_LIBRARY_DIR<br>
>>>>> >> ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})<br>
>>>>> >><br>
>>>>> >> +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR})<br>
>>>>> >> +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR})<br>
>>>>> >> +<br>
>>>>> >> # Declare libc++ configuration variables.<br>
>>>>> >> # They are intended for use as follows:<br>
>>>>> >> # LIBCXX_CXX_FLAGS: General flags for both the compiler and linker.<br>
>>>>> >> # LIBCXX_COMPILE_FLAGS: Compile only flags.<br>
>>>>> >> # LIBCXX_LINK_FLAGS: Linker only flags.<br>
>>>>> >> -set(LIBCXX_CXX_FLAGS "")<br>
>>>>> >> set(LIBCXX_COMPILE_FLAGS "")<br>
>>>>> >> set(LIBCXX_LINK_FLAGS "")<br>
>>>>> >> +set(LIBCXX_LIBRARIES "")<br>
>>>>> >><br>
>>>>> >> # Configure compiler.<br>
>>>>> >> include(config-ix)<br>
>>>>> >> -# Configure ABI library<br>
>>>>> >> -include(HandleLibCXXABI)<br>
>>>>> >> +<br>
>>>>> >> # Configure coverage options.<br>
>>>>> >> if (LIBCXX_GENERATE_COVERAGE)<br>
>>>>> >> include(CodeCoverage)<br>
>>>>> >> set(CMAKE_BUILD_TYPE "COVERAGE" CACHE STRING "" FORCE)<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> +string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)<br>
>>>>> >> +<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> # Setup Compiler Flags<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >><br>
>>>>> >> -# Get required flags.<br>
>>>>> >> -# On all systems the system c++ standard library headers need to be<br>
>>>>> >> excluded.<br>
>>>>> >> -if (MSVC)<br>
>>>>> >> - # MSVC only has -X, which disables all default includes;<br>
>>>>> >> including the<br>
>>>>> >> crt.<br>
>>>>> >> - # Thus, we do nothing and hope we don't accidentally include any<br>
>>>>> >> of the<br>
>>>>> >> C++<br>
>>>>> >> - # headers.<br>
>>>>> >> -else()<br>
>>>>> >> - if (LIBCXX_HAS_NOSTDINCXX_FLAG)<br>
>>>>> >> - list(APPEND LIBCXX_COMPILE_FLAGS -nostdinc++)<br>
>>>>> >> - string(REPLACE "-stdlib=libc++" "" CMAKE_CXX_FLAGS<br>
>>>>> >> "${CMAKE_CXX_FLAGS}")<br>
>>>>> >> - string(REPLACE "-stdlib=libstdc++" "" CMAKE_CXX_FLAGS<br>
>>>>> >> "${CMAKE_CXX_FLAGS}")<br>
>>>>> >> - endif()<br>
>>>>> >> - # If c++1y has been enabled then attempt to use it. Fail if it is<br>
>>>>> >> no<br>
>>>>> >> supported<br>
>>>>> >> - # by the compiler. Otherwise choose c++11 and ensure the compiler<br>
>>>>> >> supports it.<br>
>>>>> >> - if (LIBCXX_ENABLE_CXX1Y)<br>
>>>>> >> - if (LIBCXX_HAS_STDCXX1Y_FLAG)<br>
>>>>> >> - set(LIBCXX_STD_VERSION c++1y)<br>
>>>>> >> - else()<br>
>>>>> >> - message(FATAL_ERROR "c++1y was enabled but the compiler does<br>
>>>>> >> not<br>
>>>>> >> support it.")<br>
>>>>> >> - endif()<br>
>>>>> >> - else()<br>
>>>>> >> - if (LIBCXX_HAS_STDCXX11_FLAG)<br>
>>>>> >> - set(LIBCXX_STD_VERSION c++11)<br>
>>>>> >> - else()<br>
>>>>> >> - message(FATAL_ERROR "c++11 is required by libc++ but is not<br>
>>>>> >> supported by the compiler")<br>
>>>>> >> - endif()<br>
>>>>> >> - endif()<br>
>>>>> >> - # LIBCXX_STD_VERSION should always be set at this point.<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS "-std=${LIBCXX_STD_VERSION}")<br>
>>>>> >> -endif()<br>
>>>>> >> +include(HandleLibCXXABI) # Steup the ABI library flags<br>
>>>>> >><br>
>>>>> >> -macro(append_if list condition var)<br>
>>>>> >> - if (${condition})<br>
>>>>> >> - list(APPEND ${list} ${var})<br>
>>>>> >> - endif()<br>
>>>>> >> -endmacro()<br>
>>>>> >> +# Include macros for adding and removing libc++ flags.<br>
>>>>> >> +include(HandleLibcxxFlags)<br>
>>>>> >><br>
>>>>> >> -# Get warning flags<br>
>>>>> >> -# Disable the system header pragma.<br>
>>>>> >> -add_definitions(-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)<br>
>>>>> >> -if (NOT MSVC)<br>
>>>>> >> - append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_WALL_FLAG -Wall)<br>
>>>>> >> - list(APPEND LIBCXX_COMPILE_FLAGS -Werror=return-type)<br>
>>>>> >> +# Remove flags that may have snuck in.<br>
>>>>> >> +remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG<br>
>>>>> >> + -stdlib=libc++ -stdlib=libstdc++ -lc++abi -m32)<br>
>>>>> >> +<br>
>>>>> >> +# Required flags<br>
>>>>> >> ==============================================================<br>
>>>>> >> +add_compile_flags_if_supported(-std=c++11)<br>
>>>>> >> +if (NOT MSVC AND NOT LIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG)<br>
>>>>> >> + message(FATAL_ERROR "C++11 is required but the compiler does not<br>
>>>>> >> support -std=c++11")<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> -append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_W_FLAG -W)<br>
>>>>> >> -append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_WNO_UNUSED_PARAMETER_FLAG<br>
>>>>> >> -Wno-unused-parameter)<br>
>>>>> >> -append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_WWRITE_STRINGS_FLAG<br>
>>>>> >> -Wwrite-strings)<br>
>>>>> >> -append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_WNO_LONG_LONG_FLAG<br>
>>>>> >> -Wno-long-long)<br>
>>>>> >> +# On all systems the system c++ standard library headers need to be<br>
>>>>> >> excluded.<br>
>>>>> >> +# MSVC only has -X, which disables all default includes; including<br>
>>>>> >> the<br>
>>>>> >> crt.<br>
>>>>> >> +# Thus, we do nothing and hope we don't accidentally include any of<br>
>>>>> >> the<br>
>>>>> >> C++<br>
>>>>> >> +# headers<br>
>>>>> >> +add_compile_flags_if_supported(-nostdinc++)<br>
>>>>> >> +<br>
>>>>> >> +# Target flags<br>
>>>>> >> ================================================================<br>
>>>>> >> +add_flags_if(LIBCXX_BUILD_32_BITS -m32)<br>
>>>>> >> +add_flags_if(LIBCXX_TARGET_TRIPLE "-target<br>
>>>>> >> ${LIBCXX_TARGET_TRIPLE}")<br>
>>>>> >> +add_flags_if(LIBCXX_SYSROOT "--sysroot ${LIBCXX_SYSROOT}")<br>
>>>>> >> +add_flags_if(LIBCXX_GCC_TOOLCHAIN "-gcc-toolchain<br>
>>>>> >> ${LIBCXX_GCC_TOOLCHAIN}")<br>
>>>>> >> +<br>
>>>>> >> +# Warning flags<br>
>>>>> >> ===============================================================<br>
>>>>> >> +add_definitions(-D_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)<br>
>>>>> >> +add_compile_flags_if_supported(<br>
>>>>> >> + -Wall -W -Wwrite-strings<br>
>>>>> >> + -Wno-unused-parameter -Wno-long-long<br>
>>>>> >> + -Werror=return-type)<br>
>>>>> >> if (LIBCXX_ENABLE_WERROR)<br>
>>>>> >> - append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_WERROR_FLAG -Werror)<br>
>>>>> >> - append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_WX_FLAG -WX)<br>
>>>>> >> -else()<br>
>>>>> >> - append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_WNO_ERROR_FLAG<br>
>>>>> >> -Wno-error)<br>
>>>>> >> - append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_NO_WX_FLAG -WX-)<br>
>>>>> >> + add_compile_flags_if_supported(-Werror)<br>
>>>>> >> + add_compile_flags_if_supported(-WX)<br>
>>>>> >> endif()<br>
>>>>> >> if (LIBCXX_ENABLE_PEDANTIC)<br>
>>>>> >> - append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_PEDANTIC_FLAG<br>
>>>>> >> -pedantic)<br>
>>>>> >> + add_compile_flags_if_supported(-pedantic)<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> -# Get feature flags.<br>
>>>>> >> -# Exceptions<br>
>>>>> >> +# Exception flags<br>
>>>>> >> =============================================================<br>
>>>>> >> if (LIBCXX_ENABLE_EXCEPTIONS)<br>
>>>>> >> # Catches C++ exceptions only and tells the compiler to assume<br>
>>>>> >> that<br>
>>>>> >> extern C<br>
>>>>> >> # functions never throw a C++ exception.<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS LIBCXX_HAS_EHSC_FLAG -EHsc)<br>
>>>>> >> + add_compile_flags_if_supported(-EHsc)<br>
>>>>> >> else()<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS -D_LIBCPP_NO_EXCEPTIONS)<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS LIBCXX_HAS_NO_EHS_FLAG -EHs-)<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS LIBCXX_HAS_NO_EHA_FLAG -EHa-)<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS LIBCXX_HAS_FNO_EXCEPTIONS_FLAG<br>
>>>>> >> -fno-exceptions)<br>
>>>>> >> + add_definitions(-D_LIBCPP_NO_EXCEPTIONS)<br>
>>>>> >> + add_compile_flags_if_supported(-EHs- -EHa-)<br>
>>>>> >> + add_compile_flags_if_supported(-fno-exceptions)<br>
>>>>> >> endif()<br>
>>>>> >> -# RTTI<br>
>>>>> >> +<br>
>>>>> >> +# RTTI flags<br>
>>>>> >> ==================================================================<br>
>>>>> >> if (NOT LIBCXX_ENABLE_RTTI)<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS -D_LIBCPP_NO_RTTI)<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS LIBCXX_HAS_NO_GR_FLAG -GR-)<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS LIBCXX_HAS_FNO_RTTI_FLAG -fno-rtti)<br>
>>>>> >> + add_definitions(-D_LIBCPP_NO_RTTI)<br>
>>>>> >> + add_compile_flags_if_supported(-GR-)<br>
>>>>> >> + add_compile_flags_if_supported(-fno-rtti)<br>
>>>>> >> endif()<br>
>>>>> >> -# Assert<br>
>>>>> >> -string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)<br>
>>>>> >> +<br>
>>>>> >> +# Assertion flags<br>
>>>>> >> =============================================================<br>
>>>>> >> +define_if(LIBCXX_ENABLE_ASSERTIONS -UNDEBUG)<br>
>>>>> >> +define_if_not(LIBCXX_ENABLE_ASSERTIONS -DNDEBUG)<br>
>>>>> >> if (LIBCXX_ENABLE_ASSERTIONS)<br>
>>>>> >> # MSVC doesn't like _DEBUG on release builds. See PR 4379.<br>
>>>>> >> - if (NOT MSVC)<br>
>>>>> >> - list(APPEND LIBCXX_COMPILE_FLAGS -D_DEBUG)<br>
>>>>> >> - endif()<br>
>>>>> >> - # On Release builds cmake automatically defines NDEBUG, so we<br>
>>>>> >> - # explicitly undefine it:<br>
>>>>> >> - if (uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")<br>
>>>>> >> - list(APPEND LIBCXX_COMPILE_FLAGS -UNDEBUG)<br>
>>>>> >> - endif()<br>
>>>>> >> -else()<br>
>>>>> >> - if (NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE")<br>
>>>>> >> - list(APPEND LIBCXX_COMPILE_FLAGS -DNDEBUG)<br>
>>>>> >> - endif()<br>
>>>>> >> -endif()<br>
>>>>> >> -# Static library<br>
>>>>> >> -if (NOT LIBCXX_ENABLE_SHARED)<br>
>>>>> >> - list(APPEND LIBCXX_COMPILE_FLAGS -D_LIBCPP_BUILD_STATIC)<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32)<br>
>>>>> >> - if (LIBCXX_BUILD_32_BITS)<br>
>>>>> >> - message(STATUS "Building 32 bits executables and libraries.")<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS "-m32")<br>
>>>>> >> - endif()<br>
>>>>> >> -elseif(LIBCXX_BUILD_32_BITS)<br>
>>>>> >> - message(FATAL_ERROR "LIBCXX_BUILD_32_BITS=ON is not supported on<br>
>>>>> >> this<br>
>>>>> >> platform.")<br>
>>>>> >> -endif()<br>
>>>>> >> -# This is the _ONLY_ place where add_definitions is called.<br>
>>>>> >> -if (MSVC)<br>
>>>>> >> - add_definitions(-D_CRT_SECURE_NO_WARNINGS)<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -# LIBCXX_ENABLE_GLOBAL_FILESYSTEM_NAMESPACE configuration<br>
>>>>> >> -if (NOT LIBCXX_ENABLE_GLOBAL_FILESYSTEM_NAMESPACE)<br>
>>>>> >> - add_definitions(-D_LIBCPP_HAS_NO_GLOBAL_FILESYSTEM_NAMESPACE)<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -# LIBCXX_ENABLE_STDIN configuration<br>
>>>>> >> -if (NOT LIBCXX_ENABLE_STDIN)<br>
>>>>> >> - add_definitions(-D_LIBCPP_HAS_NO_STDIN)<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -# LIBCXX_ENABLE_STDOUT configuration<br>
>>>>> >> -if (NOT LIBCXX_ENABLE_STDOUT)<br>
>>>>> >> - add_definitions(-D_LIBCPP_HAS_NO_STDOUT)<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -# LIBCXX_ENABLE_THREADS configuration<br>
>>>>> >> -if (NOT LIBCXX_ENABLE_THREADS)<br>
>>>>> >> - add_definitions(-D_LIBCPP_HAS_NO_THREADS)<br>
>>>>> >> - if (NOT LIBCXX_ENABLE_MONOTONIC_CLOCK)<br>
>>>>> >> - add_definitions(-D_LIBCPP_HAS_NO_MONOTONIC_CLOCK)<br>
>>>>> >> - endif()<br>
>>>>> >> -# Ensure LIBCXX_ENABLE_MONOTONIC_CLOCK is set to ON.<br>
>>>>> >> -elseif(NOT LIBCXX_ENABLE_MONOTONIC_CLOCK)<br>
>>>>> >> - message(FATAL_ERROR "LIBCXX_ENABLE_MONOTONIC_CLOCK can only be<br>
>>>>> >> set to<br>
>>>>> >> OFF"<br>
>>>>> >> - " when LIBCXX_ENABLE_THREADS is also set to<br>
>>>>> >> OFF.")<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -# LIBCXX_ENABLE_THREAD_UNSAFE_C_FUNCTIONS configuration<br>
>>>>> >> -if (NOT LIBCXX_ENABLE_THREAD_UNSAFE_C_FUNCTIONS)<br>
>>>>> >> - add_definitions(-D_LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS)<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -# Configure for sanitizers. If LIBCXX_BUILT_STANDALONE then we have<br>
>>>>> >> to do<br>
>>>>> >> -# the flag translation ourselves. Othewise LLVM's CMakeList.txt<br>
>>>>> >> will<br>
>>>>> >> handle it.<br>
>>>>> >> -if (LIBCXX_BUILT_STANDALONE)<br>
>>>>> >> - # NOTE: LLVM_USE_SANITIZER checks for a UNIX like system instead<br>
>>>>> >> of<br>
>>>>> >> MSVC.<br>
>>>>> >> - # But we don't have LLVM_ON_UNIX so checking for MSVC is the best<br>
>>>>> >> we<br>
>>>>> >> can do.<br>
>>>>> >> - if (LLVM_USE_SANITIZER AND NOT MSVC)<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS<br>
>>>>> >> LIBCXX_HAS_FNO_OMIT_FRAME_POINTER_FLAG<br>
>>>>> >> - "-fno-omit-frame-pointer")<br>
>>>>> >> - if (NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND<br>
>>>>> >> - NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")<br>
>>>>> >> - append_if(LIBCXX_CXX_FLAGS LIBCXX_HAS_GLINE_TABLES_ONLY_FLAG<br>
>>>>> >> - "-gline-tables-only")<br>
>>>>> >> - endif()<br>
>>>>> >> - if (LLVM_USE_SANITIZER STREQUAL "Address")<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS "-fsanitize=address")<br>
>>>>> >> - elseif (LLVM_USE_SANITIZER MATCHES "Memory(WithOrigins)?")<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS "-fsanitize=memory")<br>
>>>>> >> - if (LLVM_USE_SANITIZER STREQUAL "MemoryWithOrigins")<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS<br>
>>>>> >> "-fsanitize-memory-track-origins")<br>
>>>>> >> - endif()<br>
>>>>> >> - elseif (LLVM_USE_SANITIZER STREQUAL "Undefined")<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS<br>
>>>>> >> - "-fsanitize=undefined -fno-sanitize=vptr,function<br>
>>>>> >> -fno-sanitize-recover")<br>
>>>>> >> - elseif (LLVM_USE_SANITIZER STREQUAL "Thread")<br>
>>>>> >> - list(APPEND LIBCXX_CXX_FLAGS "-fsanitize=thread")<br>
>>>>> >> - else()<br>
>>>>> >> - message(WARNING "Unsupported value of LLVM_USE_SANITIZER:<br>
>>>>> >> ${LLVM_USE_SANITIZER}")<br>
>>>>> >> - endif()<br>
>>>>> >> - elseif(MSVC)<br>
>>>>> >> - message(WARNING "LLVM_USE_SANITIZER is not supported with<br>
>>>>> >> MSVC")<br>
>>>>> >> - endif()<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -append_if(LIBCXX_CXX_FLAGS LIBCXX_TARGET_TRIPLE<br>
>>>>> >> - "-target ${LIBCXX_TARGET_TRIPLE}")<br>
>>>>> >> -<br>
>>>>> >> -append_if(LIBCXX_CXX_FLAGS LIBCXX_SYSROOT "--sysroot<br>
>>>>> >> ${LIBCXX_SYSROOT}")<br>
>>>>> >> -append_if(LIBCXX_CXX_FLAGS LIBCXX_GCC_TOOLCHAIN<br>
>>>>> >> - "-gcc-toolchain ${LIBCXX_GCC_TOOLCHAIN}")<br>
>>>>> >> -<br>
>>>>> >> -if (LLVM_USE_SANITIZER AND LIBCXX_GENERATE_COVERAGE)<br>
>>>>> >> - message(FATAL_ERROR "LLVM_USE_SANITIZER cannot be used with<br>
>>>>> >> LIBCXX_GENERATE_COVERAGE")<br>
>>>>> >> + define_if_not(MSVC -D_DEBUG)<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> -string(REPLACE ";" " " LIBCXX_CXX_FLAGS "${LIBCXX_CXX_FLAGS}")<br>
>>>>> >> -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LIBCXX_CXX_FLAGS}")<br>
>>>>> >> +# Feature flags<br>
>>>>> >> ===============================================================<br>
>>>>> >> +define_if(MSVC -D_CRT_SECURE_NO_WARNINGS)<br>
>>>>> >> +define_if_not(LIBCXX_ENABLE_GLOBAL_FILESYSTEM_NAMESPACE<br>
>>>>> >> -D_LIBCPP_HAS_NO_GLOBAL_FILESYSTEM_NAMESPACE)<br>
>>>>> >> +define_if_not(LIBCXX_ENABLE_STDIN -D_LIBCPP_HAS_NO_STDIN)<br>
>>>>> >> +define_if_not(LIBCXX_ENABLE_STDOUT -D_LIBCPP_HAS_NO_STDOUT)<br>
>>>>> >> +define_if_not(LIBCXX_ENABLE_THREADS -D_LIBCPP_HAS_NO_THREADS)<br>
>>>>> >> +define_if_not(LIBCXX_ENABLE_MONOTONIC_CLOCK<br>
>>>>> >> -D_LIBCPP_HAS_NO_MONOTONIC_CLOCK)<br>
>>>>> >> +define_if_not(LIBCXX_ENABLE_THREAD_UNSAFE_C_FUNCTIONS<br>
>>>>> >> -D_LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS)<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> -# Setup Source Code<br>
>>>>> >> +# Setup Source Code And Tests<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> #===============================================================================<br>
>>>>> >> -<br>
>>>>> >> include_directories(include)<br>
>>>>> >> add_subdirectory(include)<br>
>>>>> >> -<br>
>>>>> >> -# Add source code. This also contains all of the logic for deciding<br>
>>>>> >> linker flags<br>
>>>>> >> -# soname, etc...<br>
>>>>> >> add_subdirectory(lib)<br>
>>>>> >> -<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> -#===============================================================================<br>
>>>>> >> -# Setup Tests<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> -#===============================================================================<br>
>>>>> >> -<br>
>>>>> >> add_subdirectory(test)<br>
>>>>> >><br>
>>>>> >> Added: libcxx/trunk/cmake/Modules/FindLLVM.cmake<br>
>>>>> >> URL:<br>
>>>>> >><br>
</div></div><div><div class="h5">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_cmake_Modules_FindLLVM.cmake-3Frev-3D243574-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=fLWuVnGub8tmzYHtoLKlj8NMlxQ1Bt7f2vdK5ezIVjQ&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/FindLLVM.cmake?rev=243574&view=auto</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/cmake/Modules/FindLLVM.cmake (added)<br>
>>>>> >> +++ libcxx/trunk/cmake/Modules/FindLLVM.cmake Wed Jul 29 16:07:28<br>
>>>>> >> 2015<br>
>>>>> >> @@ -0,0 +1,81 @@<br>
>>>>> >> +<br>
>>>>> >> +if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
>>>>> >> + # Rely on llvm-config.<br>
>>>>> >> + set(CONFIG_OUTPUT)<br>
>>>>> >> + find_program(LLVM_CONFIG "llvm-config")<br>
>>>>> >> + if(DEFINED LLVM_PATH)<br>
>>>>> >> + set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIR} CACHE PATH "Path to<br>
>>>>> >> llvm/include")<br>
>>>>> >> + set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source<br>
>>>>> >> tree")<br>
>>>>> >> + set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})<br>
>>>>> >> + set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")<br>
>>>>> >> + elseif(LLVM_CONFIG)<br>
>>>>> >> + message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")<br>
>>>>> >> + set(CONFIG_COMMAND ${LLVM_CONFIG}<br>
>>>>> >> + "--includedir"<br>
>>>>> >> + "--prefix"<br>
>>>>> >> + "--src-root")<br>
>>>>> >> + execute_process(<br>
>>>>> >> + COMMAND ${CONFIG_COMMAND}<br>
>>>>> >> + RESULT_VARIABLE HAD_ERROR<br>
>>>>> >> + OUTPUT_VARIABLE CONFIG_OUTPUT<br>
>>>>> >> + )<br>
>>>>> >> + if(NOT HAD_ERROR)<br>
>>>>> >> + string(REGEX REPLACE<br>
>>>>> >> + "[ \t]*[\r\n]+[ \t]*" ";"<br>
>>>>> >> + CONFIG_OUTPUT ${CONFIG_OUTPUT})<br>
>>>>> >> + else()<br>
>>>>> >> + string(REPLACE ";" " " CONFIG_COMMAND_STR<br>
>>>>> >> "${CONFIG_COMMAND}")<br>
>>>>> >> + message(STATUS "${CONFIG_COMMAND_STR}")<br>
>>>>> >> + message(FATAL_ERROR "llvm-config failed with status<br>
>>>>> >> ${HAD_ERROR}")<br>
>>>>> >> + endif()<br>
>>>>> >> +<br>
>>>>> >> + list(GET CONFIG_OUTPUT 0 INCLUDE_DIR)<br>
>>>>> >> + list(GET CONFIG_OUTPUT 1 LLVM_OBJ_ROOT)<br>
>>>>> >> + list(GET CONFIG_OUTPUT 2 MAIN_SRC_DIR)<br>
>>>>> >> +<br>
>>>>> >> + set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to<br>
>>>>> >> llvm/include")<br>
>>>>> >> + set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM<br>
>>>>> >> build<br>
>>>>> >> tree")<br>
>>>>> >> + set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM<br>
>>>>> >> source<br>
>>>>> >> tree")<br>
>>>>> >> + set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")<br>
>>>>> >> + else()<br>
>>>>> >> + message(FATAL_ERROR "llvm-config not found and<br>
>>>>> >> LLVM_MAIN_SRC_DIR not<br>
>>>>> >> defined. "<br>
>>>>> >> + "Reconfigure with<br>
>>>>> >> -DLLVM_CONFIG=path/to/llvm-config "<br>
>>>>> >> + "or -DLLVM_PATH=path/to/llvm-source-root.")<br>
>>>>> >> + endif()<br>
>>>>> >> +<br>
>>>>> >> + if (NOT EXISTS ${LLVM_MAIN_SRC_DIR})<br>
>>>>> >> + message(FATAL_ERROR "Not found: ${LLVM_MAIN_SRC_DIR}")<br>
>>>>> >> + endif()<br>
>>>>> >> +<br>
>>>>> >> + if(NOT EXISTS ${LLVM_CMAKE_PATH})<br>
>>>>> >> + message(FATAL_ERROR "Not found: ${LLVM_CMAKE_PATH}")<br>
>>>>> >> + endif()<br>
>>>>> >> +<br>
>>>>> >> + list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")<br>
>>>>> >> + list(APPEND CMAKE_MODULE_PATH<br>
>>>>> >> "${LLVM_MAIN_SRC_DIR}/cmake/modules")<br>
>>>>> >> +<br>
>>>>> >> +<br>
>>>>> >> + if(LLVM_LIT)<br>
>>>>> >> + # Define the default arguments to use with 'lit', and an option<br>
>>>>> >> for<br>
>>>>> >> the user<br>
>>>>> >> + # to override.<br>
>>>>> >> + set(LIT_ARGS_DEFAULT "-sv --show-xfail --show-unsupported")<br>
>>>>> >> + if (MSVC OR XCODE)<br>
>>>>> >> + set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")<br>
>>>>> >> + endif()<br>
>>>>> >> + set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default<br>
>>>>> >> options<br>
>>>>> >> for lit")<br>
>>>>> >> +<br>
>>>>> >> + # On Win32 hosts, provide an option to specify the path to the<br>
>>>>> >> GnuWin32 tools.<br>
>>>>> >> + if( WIN32 AND NOT CYGWIN )<br>
>>>>> >> + set(LLVM_LIT_TOOLS_DIR "" CACHE PATH "Path to GnuWin32<br>
>>>>> >> tools")<br>
>>>>> >> + endif()<br>
>>>>> >> + else()<br>
>>>>> >> + set(LLVM_INCLUDE_TESTS OFF)<br>
>>>>> >> + endif()<br>
>>>>> >> +<br>
>>>>> >> + include(AddLLVM) # Include the LLVM CMake functions.<br>
>>>>> >> + include(HandleLLVMOptions)<br>
>>>>> >> + set(LIBCXX_BUILT_STANDALONE 1)<br>
>>>>> >> +else()<br>
>>>>> >> + set(LLVM_MAIN_SRC_DIR "${CMAKE_SOURCE_DIR}" CACHE PATH "Path to<br>
>>>>> >> LLVM<br>
>>>>> >> source tree")<br>
>>>>> >> + set(LLVM_LIT "${CMAKE_SOURCE_DIR}/utils/lit/lit.py")<br>
>>>>> >> +endif()<br>
>>>>> >><br>
>>>>> >> Modified: libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake<br>
>>>>> >> URL:<br>
>>>>> >><br>
</div></div><div><div class="h5">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_cmake_Modules_HandleLibCXXABI.cmake-3Frev-3D243574-26r1-3D243573-26r2-3D243574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=DcO0pRm7FFdMxxWpatqJoI7OnHKIGXgiRIBZJnwS_mE&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake?rev=243574&r1=243573&r2=243574&view=diff</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake (original)<br>
>>>>> >> +++ libcxx/trunk/cmake/Modules/HandleLibCXXABI.cmake Wed Jul 29<br>
>>>>> >> 16:07:28<br>
>>>>> >> 2015<br>
>>>>> >> @@ -58,6 +58,21 @@ macro(setup_abi_lib abidefines abilib ab<br>
>>>>> >><br>
>>>>> >> endmacro()<br>
>>>>> >><br>
>>>>> >> +# Setup the default options if LIBCXX_CXX_ABI is not specified.<br>
>>>>> >> +if (NOT LIBCXX_CXX_ABI)<br>
>>>>> >> + if (NOT DEFINED LIBCXX_BUILT_STANDALONE AND<br>
>>>>> >> + IS_DIRECTORY "${CMAKE_SOURCE_DIR}/projects/libcxxabi")<br>
>>>>> >> + set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi")<br>
>>>>> >> + set(LIBCXX_CXX_ABI_INCLUDE_PATHS<br>
>>>>> >> "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include")<br>
>>>>> >> + set(LIBCXX_CXX_ABI_INTREE 1)<br>
>>>>> >> + else ()<br>
>>>>> >> + set(LIBCXX_CXX_ABI_LIBNAME "none")<br>
>>>>> >> + endif ()<br>
>>>>> >> +else ()<br>
>>>>> >> + set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}")<br>
>>>>> >> +endif ()<br>
>>>>> >> +<br>
>>>>> >> +# Configure based on the selected ABI library.<br>
>>>>> >> if ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libstdc++" OR<br>
>>>>> >> "${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libsupc++")<br>
>>>>> >> set(_LIBSUPCXX_INCLUDE_FILES<br>
>>>>> >><br>
>>>>> >> Added: libcxx/trunk/cmake/Modules/HandleLibcxxFlags.cmake<br>
>>>>> >> URL:<br>
>>>>> >><br>
</div></div><div><div class="h5">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_cmake_Modules_HandleLibcxxFlags.cmake-3Frev-3D243574-26view-3Dauto&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=HQs1rwIYt6r4AapFXBxJu-iSZ3zC6ogxt4EZgIIdMkE&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/HandleLibcxxFlags.cmake?rev=243574&view=auto</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/cmake/Modules/HandleLibcxxFlags.cmake (added)<br>
>>>>> >> +++ libcxx/trunk/cmake/Modules/HandleLibcxxFlags.cmake Wed Jul 29<br>
>>>>> >> 16:07:28<br>
>>>>> >> 2015<br>
>>>>> >> @@ -0,0 +1,147 @@<br>
>>>>> >> +# HandleLibcxxFlags - A set of macros used to setup the flags used<br>
>>>>> >> to<br>
>>>>> >> compile<br>
>>>>> >> +# and link libc++. These macros add flags to the following CMake<br>
>>>>> >> variables.<br>
>>>>> >> +# - LIBCXX_COMPILE_FLAGS: flags used to compile libc++<br>
>>>>> >> +# - LIBCXX_LINK_FLAGS: flags used to link libc++<br>
>>>>> >> +# - LIBCXX_LIBRARIES: libraries to link libc++ to.<br>
>>>>> >> +<br>
>>>>> >> +include(CheckCXXCompilerFlag)<br>
>>>>> >> +<br>
>>>>> >> +unset(add_flag_if_supported)<br>
>>>>> >> +<br>
>>>>> >> +# Mangle the name of a compiler flag into a valid CMake identifier.<br>
>>>>> >> +# Ex: --std=c++11 -> STD_EQ_CXX11<br>
>>>>> >> +macro(mangle_name str output)<br>
>>>>> >> + string(STRIP "${str}" strippedStr)<br>
>>>>> >> + string(REGEX REPLACE "^/" "" strippedStr "${strippedStr}")<br>
>>>>> >> + string(REGEX REPLACE "^-+" "" strippedStr "${strippedStr}")<br>
>>>>> >> + string(REGEX REPLACE "-+$" "" strippedStr "${strippedStr}")<br>
>>>>> >> + string(REPLACE "-" "_" strippedStr "${strippedStr}")<br>
>>>>> >> + string(REPLACE "=" "_EQ_" strippedStr "${strippedStr}")<br>
>>>>> >> + string(REPLACE "+" "X" strippedStr "${strippedStr}")<br>
>>>>> >> + string(TOUPPER "${strippedStr}" ${output})<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Remove a list of flags from all CMake variables that affect<br>
>>>>> >> compile<br>
>>>>> >> flags.<br>
>>>>> >> +# This can be used to remove unwanted flags specified on the<br>
>>>>> >> command line<br>
>>>>> >> +# or added in other parts of LLVM's cmake configuration.<br>
>>>>> >> +macro(remove_flags)<br>
>>>>> >> + foreach(var ${ARGN})<br>
>>>>> >> + string(REPLACE "${var}" "" CMAKE_CXX_FLAGS<br>
>>>>> >> "${CMAKE_CXX_FLAGS}")<br>
>>>>> >> + string(REPLACE "${var}" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")<br>
>>>>> >> + string(REPLACE "${var}" "" CMAKE_EXE_LINKER_FLAGS<br>
>>>>> >> "${CMAKE_EXE_LINKER_FLAGS}")<br>
>>>>> >> + string(REPLACE "${var}" "" CMAKE_SHARED_LINKER_FLAGS<br>
>>>>> >> "${CMAKE_SHARED_LINKER_FLAGS}")<br>
>>>>> >> + string(REPLACE "${var}" "" CMAKE_SHARED_MODULE_FLAGS<br>
>>>>> >> "${CMAKE_SHARED_MODULE_FLAGS}")<br>
>>>>> >> + remove_definitions(${var})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro(remove_flags)<br>
>>>>> >> +<br>
>>>>> >> +# Add a macro definition if condition is true.<br>
>>>>> >> +macro(define_if condition def)<br>
>>>>> >> + if (${condition})<br>
>>>>> >> + add_definitions(${def})<br>
>>>>> >> + endif()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Add a macro definition if condition is not true.<br>
>>>>> >> +macro(define_if_not condition def)<br>
>>>>> >> + if (NOT ${condition})<br>
>>>>> >> + add_definitions(${def})<br>
>>>>> >> + endif()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Add a specified list of flags to both 'LIBCXX_COMPILE_FLAGS' and<br>
>>>>> >> +# 'LIBCXX_LINK_FLAGS'.<br>
>>>>> >> +macro(add_flags)<br>
>>>>> >> + foreach(value ${ARGN})<br>
>>>>> >> + list(APPEND LIBCXX_COMPILE_FLAGS ${value})<br>
>>>>> >> + list(APPEND LIBCXX_LINK_FLAGS ${value})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# If the specified 'condition' is true then add a list of flags to<br>
>>>>> >> both<br>
>>>>> >> +# 'LIBCXX_COMPILE_FLAGS' and 'LIBCXX_LINK_FLAGS'.<br>
>>>>> >> +macro(add_flags_if condition)<br>
>>>>> >> + if (${condition})<br>
>>>>> >> + add_flags(${ARGN})<br>
>>>>> >> + endif()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Add each flag in the list to LIBCXX_COMPILE_FLAGS and<br>
>>>>> >> LIBCXX_LINK_FLAGS<br>
>>>>> >> +# if that flag is supported by the current compiler.<br>
>>>>> >> +macro(add_flags_if_supported)<br>
>>>>> >> + foreach(flag ${ARGN})<br>
>>>>> >> + mangle_name("${flag}" flagname)<br>
>>>>> >> + check_cxx_compiler_flag("${flag}"<br>
>>>>> >> "LIBCXX_SUPPORTS_${flagname}_FLAG")<br>
>>>>> >> + add_flags_if(LIBCXX_SUPPORTS_${flagname}_FLAG ${flag})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Add a list of flags to 'LIBCXX_COMPILE_FLAGS'.<br>
>>>>> >> +macro(add_compile_flags)<br>
>>>>> >> + foreach(f ${ARGN})<br>
>>>>> >> + list(APPEND LIBCXX_COMPILE_FLAGS ${f})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# If 'condition' is true then add the specified list of flags to<br>
>>>>> >> +# 'LIBCXX_COMPILE_FLAGS'<br>
>>>>> >> +macro(add_compile_flags_if condition)<br>
>>>>> >> + if (${condition})<br>
>>>>> >> + add_compile_flags(${ARGN})<br>
>>>>> >> + endif()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# For each specified flag, add that flag to 'LIBCXX_COMPILE_FLAGS'<br>
>>>>> >> if the<br>
>>>>> >> +# flag is supported by the C++ compiler.<br>
>>>>> >> +macro(add_compile_flags_if_supported)<br>
>>>>> >> + foreach(flag ${ARGN})<br>
>>>>> >> + mangle_name("${flag}" flagname)<br>
>>>>> >> + check_cxx_compiler_flag("-Werror ${flag}"<br>
>>>>> >> "LIBCXX_SUPPORTS_${flagname}_FLAG")<br>
>>>>> >> + add_compile_flags_if(LIBCXX_SUPPORTS_${flagname}_FLAG<br>
>>>>> >> ${flag})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Add a list of flags to 'LIBCXX_LINK_FLAGS'.<br>
>>>>> >> +macro(add_link_flags)<br>
>>>>> >> + foreach(f ${ARGN})<br>
>>>>> >> + list(APPEND LIBCXX_LINK_FLAGS ${f})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# If 'condition' is true then add the specified list of flags to<br>
>>>>> >> +# 'LIBCXX_LINK_FLAGS'<br>
>>>>> >> +macro(add_link_flags_if condition)<br>
>>>>> >> + if (${condition})<br>
>>>>> >> + add_link_flags(${ARGN})<br>
>>>>> >> + endif()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# For each specified flag, add that flag to 'LIBCXX_LINK_FLAGS' if<br>
>>>>> >> the<br>
>>>>> >> +# flag is supported by the C++ compiler.<br>
>>>>> >> +macro(add_link_flags_if_supported)<br>
>>>>> >> + foreach(flag ${ARGN})<br>
>>>>> >> + mangle_name("${flag}" flagname)<br>
>>>>> >> + check_cxx_compiler_flag("${flag}"<br>
>>>>> >> "LIBCXX_SUPPORTS_${flagname}_FLAG")<br>
>>>>> >> + add_link_flags_if(LIBCXX_SUPPORTS_${flagname}_FLAG ${flag})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Add a list of libraries or link flags to 'LIBCXX_LIBRARIES'.<br>
>>>>> >> +macro(add_library_flags)<br>
>>>>> >> + foreach(lib ${ARGN})<br>
>>>>> >> + list(APPEND LIBCXX_LIBRARIES ${lib})<br>
>>>>> >> + endforeach()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# if 'condition' is true then add the specified list of libraries<br>
>>>>> >> and<br>
>>>>> >> flags<br>
>>>>> >> +# to 'LIBCXX_LIBRARIES'.<br>
>>>>> >> +macro(add_library_flags_if condition)<br>
>>>>> >> + if(${condition})<br>
>>>>> >> + add_library_flags(${ARGN})<br>
>>>>> >> + endif()<br>
>>>>> >> +endmacro()<br>
>>>>> >> +<br>
>>>>> >> +# Turn a comma separated CMake list into a space separated string.<br>
>>>>> >> +macro(split_list listname)<br>
>>>>> >> + string(REPLACE ";" " " ${listname} "${${listname}}")<br>
>>>>> >> +endmacro()<br>
>>>>> >><br>
>>>>> >> Modified: libcxx/trunk/cmake/config-ix.cmake<br>
>>>>> >> URL:<br>
>>>>> >><br>
</div></div><div><div class="h5">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_cmake_config-2Dix.cmake-3Frev-3D243574-26r1-3D243573-26r2-3D243574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=C4RMchn93vlyy9fVtY_cnFIMmQW2HjyIa1WNAWU7iqk&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/config-ix.cmake?rev=243574&r1=243573&r2=243574&view=diff</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/cmake/config-ix.cmake (original)<br>
>>>>> >> +++ libcxx/trunk/cmake/config-ix.cmake Wed Jul 29 16:07:28 2015<br>
>>>>> >> @@ -2,23 +2,7 @@ include(CheckLibraryExists)<br>
>>>>> >> include(CheckCXXCompilerFlag)<br>
>>>>> >><br>
>>>>> >> # Check compiler flags<br>
>>>>> >> -check_cxx_compiler_flag(-std=c++11<br>
>>>>> >> LIBCXX_HAS_STDCXX11_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-std=c++1y<br>
>>>>> >> LIBCXX_HAS_STDCXX1Y_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-fPIC<br>
>>>>> >> LIBCXX_HAS_FPIC_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-fno-omit-frame-pointer<br>
>>>>> >> LIBCXX_HAS_FNO_OMIT_FRAME_POINTER_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-nodefaultlibs<br>
>>>>> >> LIBCXX_HAS_NODEFAULTLIBS_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-nostdinc++<br>
>>>>> >> LIBCXX_HAS_NOSTDINCXX_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-Wall<br>
>>>>> >> LIBCXX_HAS_WALL_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-W LIBCXX_HAS_W_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-Wno-unused-parameter<br>
>>>>> >> LIBCXX_HAS_WNO_UNUSED_PARAMETER_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-Wwrite-strings<br>
>>>>> >> LIBCXX_HAS_WWRITE_STRINGS_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-Wno-long-long<br>
>>>>> >> LIBCXX_HAS_WNO_LONG_LONG_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-pedantic<br>
>>>>> >> LIBCXX_HAS_PEDANTIC_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-Werror<br>
>>>>> >> LIBCXX_HAS_WERROR_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-Wno-error<br>
>>>>> >> LIBCXX_HAS_WNO_ERROR_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-fno-exceptions<br>
>>>>> >> LIBCXX_HAS_FNO_EXCEPTIONS_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-fno-rtti<br>
>>>>> >> LIBCXX_HAS_FNO_RTTI_FLAG)<br>
>>>>> >> -check_cxx_compiler_flag(-gline-tables-only<br>
>>>>> >> LIBCXX_HAS_GLINE_TABLES_ONLY_FLAG)<br>
>>>>> >> +<br>
>>>>> >> check_cxx_compiler_flag(/WX LIBCXX_HAS_WX_FLAG)<br>
>>>>> >> check_cxx_compiler_flag(/WX-<br>
>>>>> >> LIBCXX_HAS_NO_WX_FLAG)<br>
>>>>> >> check_cxx_compiler_flag(/EHsc<br>
>>>>> >> LIBCXX_HAS_EHSC_FLAG)<br>
>>>>> >> @@ -26,6 +10,7 @@ check_cxx_compiler_flag(/EHs-<br>
>>>>> >> check_cxx_compiler_flag(/EHa-<br>
>>>>> >> LIBCXX_HAS_NO_EHA_FLAG)<br>
>>>>> >> check_cxx_compiler_flag(/GR-<br>
>>>>> >> LIBCXX_HAS_NO_GR_FLAG)<br>
>>>>> >><br>
>>>>> >> +<br>
>>>>> >> # Check libraries<br>
>>>>> >> check_library_exists(pthread pthread_create ""<br>
>>>>> >> LIBCXX_HAS_PTHREAD_LIB)<br>
>>>>> >> check_library_exists(c printf "" LIBCXX_HAS_C_LIB)<br>
>>>>> >><br>
>>>>> >> Modified: libcxx/trunk/lib/CMakeLists.txt<br>
>>>>> >> URL:<br>
>>>>> >><br>
</div></div><div><div class="h5">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_lib_CMakeLists.txt-3Frev-3D243574-26r1-3D243573-26r2-3D243574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=52KrYZl8C2hTM_LkKK3mybLOX-wD5fPNsWSBonwtDcs&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=243574&r1=243573&r2=243574&view=diff</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/lib/CMakeLists.txt (original)<br>
>>>>> >> +++ libcxx/trunk/lib/CMakeLists.txt Wed Jul 29 16:07:28 2015<br>
>>>>> >> @@ -25,48 +25,23 @@ if (MSVC_IDE OR XCODE)<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> if (LIBCXX_ENABLE_SHARED)<br>
>>>>> >> - add_library(cxx SHARED<br>
>>>>> >> - ${LIBCXX_SOURCES}<br>
>>>>> >> - ${LIBCXX_HEADERS}<br>
>>>>> >> - )<br>
>>>>> >> + add_library(cxx SHARED ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})<br>
>>>>> >> else()<br>
>>>>> >> - add_library(cxx STATIC<br>
>>>>> >> - ${LIBCXX_SOURCES}<br>
>>>>> >> - ${LIBCXX_HEADERS}<br>
>>>>> >> - )<br>
>>>>> >> -endif()<br>
>>>>> >> -<br>
>>>>> >> -#if LIBCXX_CXX_ABI_LIBRARY_PATH is defined we want to add it to the<br>
>>>>> >> search path.<br>
>>>>> >> -if (DEFINED LIBCXX_CXX_ABI_LIBRARY_PATH)<br>
>>>>> >> - target_link_libraries(cxx "-L${LIBCXX_CXX_ABI_LIBRARY_PATH}")<br>
>>>>> >> + add_library(cxx STATIC ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> if (DEFINED LIBCXX_CXX_ABI_DEPS)<br>
>>>>> >> add_dependencies(cxx LIBCXX_CXX_ABI_DEPS)<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> -set(libraries "")<br>
>>>>> >> -if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)<br>
>>>>> >> - # TODO(ericwf): Remove these GNU specific linker flags and let<br>
>>>>> >> CMake<br>
>>>>> >> do the<br>
>>>>> >> - # configuration. This will be more portable.<br>
>>>>> >> - list(APPEND libraries "-Wl,--whole-archive" "-Wl,-Bstatic")<br>
>>>>> >> - list(APPEND libraries "${LIBCXX_CXX_ABI_LIBRARY}")<br>
>>>>> >> - list(APPEND libraries "-Wl,-Bdynamic" "-Wl,--no-whole-archive")<br>
>>>>> >> -else()<br>
>>>>> >> - list(APPEND libraries "${LIBCXX_CXX_ABI_LIBRARY}")<br>
>>>>> >> -endif()<br>
>>>>> >> +#if LIBCXX_CXX_ABI_LIBRARY_PATH is defined we want to add it to the<br>
>>>>> >> search path.<br>
>>>>> >> +add_link_flags_if(LIBCXX_CXX_ABI_LIBRARY_PATH<br>
>>>>> >> "-L${LIBCXX_CXX_ABI_LIBRARY_PATH}")<br>
>>>>> >><br>
>>>>> >> -# Generate library list.<br>
>>>>> >> -append_if(libraries LIBCXX_HAS_PTHREAD_LIB pthread)<br>
>>>>> >> -append_if(libraries LIBCXX_HAS_C_LIB c)<br>
>>>>> >> -append_if(libraries LIBCXX_HAS_M_LIB m)<br>
>>>>> >> -append_if(libraries LIBCXX_HAS_RT_LIB rt)<br>
>>>>> >> -append_if(libraries LIBCXX_HAS_GCC_S_LIB gcc_s)<br>
>>>>> >> +add_library_flags_if(LIBCXX_COVERAGE_LIBRARY<br>
>>>>> >> "${LIBCXX_COVERAGE_LIBRARY}")<br>
>>>>> >><br>
>>>>> >> -if (LIBCXX_COVERAGE_LIBRARY)<br>
>>>>> >> - target_link_libraries(cxx ${LIBCXX_COVERAGE_LIBRARY})<br>
>>>>> >> -endif()<br>
>>>>> >> -target_link_libraries(cxx ${libraries})<br>
>>>>> >> +add_library_flags_if(LIBCXX_ENABLE_STATIC_ABI_LIBRARY<br>
>>>>> >> "-Wl,--whole-archive" "-Wl,-Bstatic")<br>
>>>>> >> +add_library_flags("${LIBCXX_CXX_ABI_LIBRARY}")<br>
>>>>> >> +add_library_flags_if(LIBCXX_ENABLE_STATIC_ABI_LIBRARY<br>
>>>>> >> "-Wl,-Bdynamic"<br>
>>>>> >> "-Wl,--no-whole-archive")<br>
>>>>> >><br>
>>>>> >> if (APPLE AND LLVM_USE_SANITIZER)<br>
>>>>> >> if ("${LLVM_USE_SANITIZER}" STREQUAL "Address")<br>
>>>>> >> @@ -89,15 +64,21 @@ if (APPLE AND LLVM_USE_SANITIZER)<br>
>>>>> >> set(LIBCXX_SANITIZER_LIBRARY "${LIBDIR}/${LIBFILE}")<br>
>>>>> >> set(LIBCXX_SANITIZER_LIBRARY "${LIBCXX_SANITIZER_LIBRARY}"<br>
>>>>> >> PARENT_SCOPE)<br>
>>>>> >> message(STATUS "Manually linking compiler-rt library:<br>
>>>>> >> ${LIBCXX_SANITIZER_LIBRARY}")<br>
>>>>> >> - target_link_libraries(cxx "${LIBCXX_SANITIZER_LIBRARY}")<br>
>>>>> >> - target_link_libraries(cxx "-Wl,-rpath,${LIBDIR}")<br>
>>>>> >> + add_library_flags("${LIBCXX_SANITIZER_LIBRARY}")<br>
>>>>> >> + add_link_flags("-Wl,-rpath,${LIBDIR}")<br>
>>>>> >> endif()<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> +# Generate library list.<br>
>>>>> >> +add_library_flags_if(LIBCXX_HAS_PTHREAD_LIB pthread)<br>
>>>>> >> +add_library_flags_if(LIBCXX_HAS_C_LIB c)<br>
>>>>> >> +add_library_flags_if(LIBCXX_HAS_M_LIB m)<br>
>>>>> >> +add_library_flags_if(LIBCXX_HAS_RT_LIB rt)<br>
>>>>> >> +add_library_flags_if(LIBCXX_HAS_GCC_S_LIB gcc_s)<br>
>>>>> >><br>
>>>>> >> # Setup flags.<br>
>>>>> >> -append_if(LIBCXX_COMPILE_FLAGS LIBCXX_HAS_FPIC_FLAG -fPIC)<br>
>>>>> >> -append_if(LIBCXX_LINK_FLAGS LIBCXX_HAS_NODEFAULTLIBS_FLAG<br>
>>>>> >> -nodefaultlibs)<br>
>>>>> >> +add_flags_if_supported(-fPIC)<br>
>>>>> >> +add_link_flags_if_supported(-nodefaultlibs)<br>
>>>>> >><br>
>>>>> >> if ( APPLE AND (LIBCXX_CXX_ABI_LIBNAME STREQUAL "libcxxabi" OR<br>
>>>>> >> LIBCXX_CXX_ABI_LIBNAME STREQUAL "none"))<br>
>>>>> >> @@ -106,8 +87,8 @@ if ( APPLE AND (LIBCXX_CXX_ABI_LIBNAME S<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> if ( CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6" )<br>
>>>>> >> - list(APPEND LIBCXX_COMPILE_FLAGS "-U__STRICT_ANSI__")<br>
>>>>> >> - list(APPEND LIBCXX_LINK_FLAGS<br>
>>>>> >> + add_definitions(-D__STRICT_ANSI__)<br>
>>>>> >> + add_link_flags(<br>
>>>>> >> "-compatibility_version 1"<br>
>>>>> >> "-current_version 1"<br>
>>>>> >> "-install_name /usr/lib/libc++.1.dylib"<br>
>>>>> >> @@ -129,7 +110,7 @@ if ( APPLE AND (LIBCXX_CXX_ABI_LIBNAME S<br>
>>>>> >> set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib<br>
>>>>> >><br>
>>>>> >> -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> - list(APPEND LIBCXX_LINK_FLAGS<br>
>>>>> >> + add_link_flags(<br>
>>>>> >> "-compatibility_version 1"<br>
>>>>> >> "-install_name /usr/lib/libc++.1.dylib"<br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"<br>
>>>>> >> @@ -139,8 +120,9 @@ if ( APPLE AND (LIBCXX_CXX_ABI_LIBNAME S<br>
>>>>> >> endif()<br>
>>>>> >> endif()<br>
>>>>> >><br>
>>>>> >> -string(REPLACE ";" " " LIBCXX_COMPILE_FLAGS<br>
>>>>> >> "${LIBCXX_COMPILE_FLAGS}")<br>
>>>>> >> -string(REPLACE ";" " " LIBCXX_LINK_FLAGS "${LIBCXX_LINK_FLAGS}")<br>
>>>>> >> +target_link_libraries(cxx ${LIBCXX_LIBRARIES})<br>
>>>>> >> +split_list(LIBCXX_COMPILE_FLAGS)<br>
>>>>> >> +split_list(LIBCXX_LINK_FLAGS)<br>
>>>>> >><br>
>>>>> >> set_target_properties(cxx<br>
>>>>> >> PROPERTIES<br>
>>>>> >><br>
>>>>> >> Modified: libcxx/trunk/test/CMakeLists.txt<br>
>>>>> >> URL:<br>
>>>>> >><br>
</div></div><div><div class="h5">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_test_CMakeLists.txt-3Frev-3D243574-26r1-3D243573-26r2-3D243574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=bpBFx-HNTRK6j9T9BZwB_m1S4tSUJZAt_tlouyALNOc&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/CMakeLists.txt?rev=243574&r1=243573&r2=243574&view=diff</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/test/CMakeLists.txt (original)<br>
>>>>> >> +++ libcxx/trunk/test/CMakeLists.txt Wed Jul 29 16:07:28 2015<br>
>>>>> >> @@ -6,84 +6,47 @@ macro(pythonize_bool var)<br>
>>>>> >> endif()<br>
>>>>> >> endmacro()<br>
>>>>> >><br>
>>>>> >> -set(LIT_EXECUTABLE "" CACHE FILEPATH "Path to LLVM's llvm-lit.")<br>
>>>>> >> +set(LIBCXX_LIT_VARIANT "libcxx" CACHE STRING<br>
>>>>> >> + "Configuration variant to use for LIT.")<br>
>>>>> >><br>
>>>>> >> -if(LIBCXX_BUILT_STANDALONE)<br>
>>>>> >> - # Make sure we can use the console pool for recent cmake and<br>
>>>>> >> ninja ><br>
>>>>> >> 1.5<br>
>>>>> >> - if(CMAKE_VERSION VERSION_LESS 3.1.20141117)<br>
>>>>> >> - set(cmake_3_2_USES_TERMINAL)<br>
>>>>> >> - else()<br>
>>>>> >> - set(cmake_3_2_USES_TERMINAL USES_TERMINAL)<br>
>>>>> >> - endif()<br>
>>>>> >> -else()<br>
>>>>> >> - include(FindPythonInterp)<br>
>>>>> >> - if(PYTHONINTERP_FOUND)<br>
>>>>> >> - set(LIT_EXECUTABLE<br>
>>>>> >> - ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/utils/lit/lit.py)<br>
>>>>> >> - else()<br>
>>>>> >> - message(WARNING "Could not find Python, cannot set<br>
>>>>> >> LIT_EXECUTABLE.")<br>
>>>>> >> - endif()<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_EXCEPTIONS)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_RTTI)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_SHARED)<br>
>>>>> >> +pythonize_bool(LIBCXX_BUILD_32_BITS)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_GLOBAL_FILESYSTEM_NAMESPACE)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_STDIN)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_STDOUT)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_THREADS)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_THREAD_UNSAFE_C_FUNCTIONS)<br>
>>>>> >> +pythonize_bool(LIBCXX_ENABLE_MONOTONIC_CLOCK)<br>
>>>>> >> +pythonize_bool(LIBCXX_GENERATE_COVERAGE)<br>
>>>>> >> +pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)<br>
>>>>> >> +<br>
>>>>> >> +# The tests shouldn't link to any ABI library when it has been<br>
>>>>> >> linked<br>
>>>>> >> into<br>
>>>>> >> +# libc++ statically.<br>
>>>>> >> +if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)<br>
>>>>> >> + set(LIBCXX_CXX_ABI_LIBNAME "none")<br>
>>>>> >> endif()<br>
>>>>> >> -<br>
>>>>> >> -if (LIT_EXECUTABLE)<br>
>>>>> >> - set(LIT_ARGS_DEFAULT "-sv --show-unsupported --show-xfail")<br>
>>>>> >> - if (MSVC OR XCODE)<br>
>>>>> >> - set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")<br>
>>>>> >> - endif()<br>
>>>>> >> - set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}"<br>
>>>>> >> - CACHE STRING "Default options for lit")<br>
>>>>> >> - set(LIT_ARGS "${LLVM_LIT_ARGS}")<br>
>>>>> >> - separate_arguments(LIT_ARGS)<br>
>>>>> >> -<br>
>>>>> >> - set(LIBCXX_LIT_VARIANT "libcxx" CACHE STRING<br>
>>>>> >> - "Configuration variant to use for LIT.")<br>
>>>>> >> -<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_EXCEPTIONS)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_RTTI)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_SHARED)<br>
>>>>> >> - pythonize_bool(LIBCXX_BUILD_32_BITS)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_GLOBAL_FILESYSTEM_NAMESPACE)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_STDIN)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_STDOUT)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_THREADS)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_THREAD_UNSAFE_C_FUNCTIONS)<br>
>>>>> >> - pythonize_bool(LIBCXX_ENABLE_MONOTONIC_CLOCK)<br>
>>>>> >> - pythonize_bool(LIBCXX_GENERATE_COVERAGE)<br>
>>>>> >> - pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)<br>
>>>>> >> -<br>
>>>>> >> - # The tests shouldn't link to any ABI library when it has been<br>
>>>>> >> linked<br>
>>>>> >> into<br>
>>>>> >> - # libc++ statically.<br>
>>>>> >> - if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)<br>
>>>>> >> - set(LIBCXX_CXX_ABI_LIBNAME "none")<br>
>>>>> >> - endif()<br>
>>>>> >> - set(LIBCXX_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE<br>
>>>>> >> STRING<br>
>>>>> >> - "TargetInfo to use when setting up test environment.")<br>
>>>>> >> - set(LIBCXX_EXECUTOR "None" CACHE STRING<br>
>>>>> >> - "Executor to use when running tests.")<br>
>>>>> >> -<br>
>>>>> >> - set(AUTO_GEN_COMMENT "## Autogenerated by libcxx<br>
>>>>> >> configuration.\n# Do<br>
>>>>> >> not edit!")<br>
>>>>> >> -<br>
>>>>> >> - configure_file(<br>
</div></div>>>>>> >> - ${CMAKE_CURRENT_SOURCE_DIR}/<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lit.site.cfg.in&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=5PPsZ9gbMn8lgH-mSWLdhM5Ntu6_V4-OkJBBvTWrg4w&e=" rel="noreferrer" target="_blank">lit.site.cfg.in</a><br>
<div><div class="h5">>>>>><br>
>>>>> >><br>
>>>>> >> - ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg<br>
>>>>> >> - @ONLY)<br>
>>>>> >> -<br>
>>>>> >> - add_custom_target(check-libcxx<br>
>>>>> >> - COMMAND ${LIT_EXECUTABLE}<br>
>>>>> >> - ${LIT_ARGS}<br>
>>>>> >> - ${CMAKE_CURRENT_BINARY_DIR}<br>
>>>>> >> - DEPENDS cxx<br>
>>>>> >> - COMMENT "Running libcxx tests"<br>
>>>>> >> - ${cmake_3_2_USES_TERMINAL})<br>
>>>>> >> -<br>
>>>>> >> - if (LIBCXX_GENERATE_COVERAGE)<br>
>>>>> >> - include(CodeCoverage)<br>
>>>>> >> - set(output_dir "${CMAKE_CURRENT_BINARY_DIR}/coverage")<br>
>>>>> >> - set(capture_dirs<br>
>>>>> >> "${LIBCXX_LIB_CMAKEFILES_DIR}/cxx.dir/;${CMAKE_CURRENT_BINARY_DIR}")<br>
>>>>> >> - set(extract_dirs<br>
>>>>> >> "${LIBCXX_SOURCE_DIR}/include;${LIBCXX_SOURCE_DIR}/src")<br>
>>>>> >> - setup_lcov_test_target_coverage("cxx" "${output_dir}"<br>
>>>>> >> "${capture_dirs}" "${extract_dirs}")<br>
>>>>> >> - endif()<br>
>>>>> >> -else()<br>
>>>>> >> - message(WARNING<br>
>>>>> >> - "LIT_EXECUTABLE not set, no check-libcxx target will be<br>
>>>>> >> available!")<br>
>>>>> >> +set(LIBCXX_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE<br>
>>>>> >> STRING<br>
>>>>> >> + "TargetInfo to use when setting up test environment.")<br>
>>>>> >> +set(LIBCXX_EXECUTOR "None" CACHE STRING<br>
>>>>> >> + "Executor to use when running tests.")<br>
>>>>> >> +<br>
>>>>> >> +set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n#<br>
>>>>> >> Do not<br>
>>>>> >> edit!")<br>
>>>>> >> +<br>
>>>>> >> +configure_file(<br>
</div></div>>>>>> >> + ${CMAKE_CURRENT_SOURCE_DIR}/<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lit.site.cfg.in&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=5PPsZ9gbMn8lgH-mSWLdhM5Ntu6_V4-OkJBBvTWrg4w&e=" rel="noreferrer" target="_blank">lit.site.cfg.in</a><br>
<span class="">>>>>> >> + ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg<br>
>>>>> >> + @ONLY)<br>
>>>>> >> +<br>
>>>>> >> +add_lit_testsuite(check-libcxx "Running libcxx tests"<br>
>>>>> >> + ${CMAKE_CURRENT_BINARY_DIR}<br>
>>>>> >> + DEPENDS cxx)<br>
>>>>> >> +<br>
>>>>> >> +if (LIBCXX_GENERATE_COVERAGE)<br>
>>>>> >> + include(CodeCoverage)<br>
>>>>> >> + set(output_dir "${CMAKE_CURRENT_BINARY_DIR}/coverage")<br>
>>>>> >> + set(capture_dirs<br>
>>>>> >> "${LIBCXX_LIB_CMAKEFILES_DIR}/cxx.dir/;${CMAKE_CURRENT_BINARY_DIR}")<br>
>>>>> >> + set(extract_dirs<br>
>>>>> >> "${LIBCXX_SOURCE_DIR}/include;${LIBCXX_SOURCE_DIR}/src")<br>
>>>>> >> + setup_lcov_test_target_coverage("cxx" "${output_dir}"<br>
>>>>> >> "${capture_dirs}"<br>
>>>>> >> "${extract_dirs}")<br>
>>>>> >> endif()<br>
>>>>> >><br>
</span><span class="">>>>>> >> Modified: libcxx/trunk/test/<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lit.site.cfg.in&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=5PPsZ9gbMn8lgH-mSWLdhM5Ntu6_V4-OkJBBvTWrg4w&e=" rel="noreferrer" target="_blank">lit.site.cfg.in</a><br>
>>>>> >> URL:<br>
>>>>> >><br>
>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_test_lit.site.cfg.in-3Frev-3D243574-26r1-3D243573-26r2-3D243574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=5x-h5wR0hGpS7ndPjYBtaUxU-uZxU4eKTz0NvuNWSz8&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.site.cfg.in?rev=243574&r1=243573&r2=243574&view=diff</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/test/<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lit.site.cfg.in&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=5PPsZ9gbMn8lgH-mSWLdhM5Ntu6_V4-OkJBBvTWrg4w&e=" rel="noreferrer" target="_blank">lit.site.cfg.in</a> (original)<br>
</span>>>>>> >> +++ libcxx/trunk/test/<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__lit.site.cfg.in&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=5PPsZ9gbMn8lgH-mSWLdhM5Ntu6_V4-OkJBBvTWrg4w&e=" rel="noreferrer" target="_blank">lit.site.cfg.in</a> Wed Jul 29 16:07:28 2015<br>
<span class="">>>>>> >> @@ -1,6 +1,5 @@<br>
>>>>> >> @AUTO_GEN_COMMENT@<br>
>>>>> >> config.cxx_under_test = "@LIBCXX_COMPILER@"<br>
>>>>> >> -config.std = "@LIBCXX_STD_VERSION@"<br>
>>>>> >> config.libcxx_src_root = "@LIBCXX_SOURCE_DIR@"<br>
>>>>> >> config.libcxx_obj_root = "@LIBCXX_BINARY_DIR@"<br>
>>>>> >> config.cxx_library_root = "@LIBCXX_LIBRARY_DIR@"<br>
>>>>> >><br>
>>>>> >> Modified: libcxx/trunk/www/index.html<br>
>>>>> >> URL:<br>
>>>>> >><br>
</span><span class="">>>>>> >> <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_libcxx_trunk_www_index.html-3Frev-3D243574-26r1-3D243573-26r2-3D243574-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=Lfgcj6uyvAg5NfwConpy_nwqMOpg58-Bp0jwEuW8EUM&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/libcxx/trunk/www/index.html?rev=243574&r1=243573&r2=243574&view=diff</a><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> ==============================================================================<br>
>>>>> >> --- libcxx/trunk/www/index.html (original)<br>
>>>>> >> +++ libcxx/trunk/www/index.html Wed Jul 29 16:07:28 2015<br>
>>>>> >> @@ -184,26 +184,30 @@<br>
>>>>> >><br>
>>>>> >> <p>In-tree build:</p><br>
>>>>> >> <ul><br>
>>>>> >> + <li><code>cd where-you-want-to-live</code></li><br>
>>>>> >> <li>Check out libcxx and <a<br>
</span>>>>>> >> href="<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__libcxxabi.llvm.org_&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=KFH89Bj2qDwKEjRgdXRSKuRiXsuIlVOBxagHHkcBz4M&e=" rel="noreferrer" target="_blank">http://libcxxabi.llvm.org/</a>">libcxxabi</a><br>
<span class="">>>>>> >> into llvm/projects</li><br>
>>>>> >> - <li><code>cd llvm</code></li><br>
>>>>> >> + <li><code>cd where-you-want-to-build</code></li><br>
>>>>> >> <li><code>mkdir build && cd build</code></li><br>
>>>>> >> - <li><code>cmake .. # Linux may require -DCMAKE_C_COMPILER=clang<br>
>>>>> >> + <li><code>cmake path/to/llvm # Linux may require<br>
>>>>> >> -DCMAKE_C_COMPILER=clang<br>
>>>>> >> -DCMAKE_CXX_COMPILER=clang++</code></li><br>
>>>>> >> <li><code>make cxx</code></li><br>
>>>>> >> </ul><br>
>>>>> >><br>
>>>>> >> - <p>Out-of-tree build:</p><br>
>>>>> >> + <p>Out-of-tree buildc:</p><br>
>>>>> >> <ul><br>
>>>>> >> - <li>Check out libcxx</li><br>
>>>>> >> + <li><code>cd where-you-want-to-live</code></li><br>
>>>>> >> + <li>Check out libcxx and llvm</li><br>
>>>>> >> <li>If not on a Mac, also check out<br>
</span>>>>>> >> <a href="<a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__libcxxabi.llvm.org_&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=BSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=DF9_fcvCZ1Brm2rCo70-V1GOUN3LSnBbYITaYM0n3wQ&s=KFH89Bj2qDwKEjRgdXRSKuRiXsuIlVOBxagHHkcBz4M&e=" rel="noreferrer" target="_blank">http://libcxxabi.llvm.org/</a>">libcxxabi</a></li><br>
<span class="">>>>>><br>
>>>>> >> - <li><code>cd libcxx</code></li><br>
>>>>> >> + <li><code>cd where-you-want-to-build</code></li><br>
>>>>> >> <li><code>mkdir build && cd build</code></li><br>
>>>>> >> - <li><code>cmake -DLIBCXX_CXX_ABI=libcxxabi<br>
>>>>> >> + <li><code>cmake -DLLVM_PATH=path/to/llvm<br>
>>>>> >> + -DLIBCXX_CXX_ABI=libcxxabi<br>
>>>>> >> -DLIBCXX_CXX_ABI_INCLUDE_PATHS=path/to/libcxxabi/include<br>
>>>>> >> - -DLIT_EXECUTABLE=path/to/llvm/utils/lit/lit.py .. # Linux<br>
>>>>> >> may<br>
>>>>> >> require<br>
>>>>> >> - -DCMAKE_C_COMPILER=clang<br>
>>>>> >> -DCMAKE_CXX_COMPILER=clang++</code></li><br>
>>>>> >> + -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++<br>
>>>>> >> + path/to/libcxx<br>
>>>>> >> + </code></li><br>
>>>>> >> <li><code>make</code></li><br>
>>>>> >> </ul><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >><br>
>>>>> >> _______________________________________________<br>
>>>>> >> cfe-commits mailing list<br>
</span>>>>>> >> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<span class="">>>>>> >> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
>>>>> ><br>
>>>>> ><br>
>>>>> ><br>
>>>>> > _______________________________________________<br>
>>>>> > cfe-commits mailing list<br>
</span>>>>>> > <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<span class="">>>>>> > <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
>>>>> ><br>
>>>><br>
>>>><br>
>>><br>
>>><br>
>>><br>
>>> --<br>
>>> Alexey Samsonov, Mountain View, CA<br>
>><br>
>><br>
>> _______________________________________________<br>
>> cfe-commits mailing list<br>
</span>>> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<span class="">>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
>><br>
><br>
><br>
><br>
> --<br>
> Alexey Samsonov<br>
</span>> <a href="mailto:vonosmas@gmail.com">vonosmas@gmail.com</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>