File tree Expand file tree Collapse file tree 3 files changed +5
-23
lines changed Expand file tree Collapse file tree 3 files changed +5
-23
lines changed Original file line number Diff line number Diff line change @@ -248,10 +248,6 @@ endif()
248248
249249set (GENERATE_CODE_ROOT "${CMAKE_CURRENT_SOURCE_DIR} /generated-src" )
250250
251- if (USE_CUSTOM_LIBCXX)
252- set (BORINGSSL_ALLOW_CXX_RUNTIME 1)
253- endif ()
254-
255251if (BORINGSSL_ALLOW_CXX_RUNTIME)
256252 add_definitions (-DBORINGSSL_ALLOW_CXX_RUNTIME)
257253endif ()
@@ -952,9 +948,6 @@ if(BUILD_TESTING)
952948 # Add minimal googletest targets. The provided one has many side-effects, and
953949 # googletest has a very straightforward build.
954950 add_library (boringssl_gtest third_party/googletest/src/gtest-all .cc)
955- if (USE_CUSTOM_LIBCXX)
956- target_link_libraries (boringssl_gtest libcxx)
957- endif ()
958951 if (BUILD_SHARED_LIBS )
959952 # This is needed for the Windows build to correctly annotate GTest's API with __declspec(dllexport)
960953 target_compile_options (boringssl_gtest PRIVATE -DGTEST_CREATE_SHARED_LIBRARY=1)
Original file line number Diff line number Diff line change @@ -726,17 +726,6 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "^(Generic|Android)$")
726726 target_link_libraries (crypto PUBLIC Threads::Threads)
727727endif ()
728728
729- # Every target depends on crypto, so we add libcxx as a dependency here to
730- # simplify injecting it everywhere.
731- if (USE_CUSTOM_LIBCXX)
732- install (TARGETS libcxx libcxxabi
733- EXPORT crypto-targets
734- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
735- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
736- )
737- target_link_libraries (crypto PUBLIC libcxx)
738- endif ()
739-
740729if (BUILD_TESTING)
741730 add_subdirectory (test )
742731
Original file line number Diff line number Diff line change @@ -34,17 +34,17 @@ unset UBSAN_OPTIONS
3434if [ $( uname -p) == " aarch64" ]; then
3535 # ARM MSAN runs get stuck on PoolTest.Threads for over an hour https://github.com/aws/aws-lc/issues/13
3636 echo " Building AWS-LC in ${build_type} mode with memory sanitizer."
37- run_build -DMSAN=1 -DUSE_CUSTOM_LIBCXX=1 " ${cflags[@]} "
37+ run_build -DMSAN=1 " ${cflags[@]} "
3838else
3939 echo " Testing AWS-LC in ${build_type} mode with memory sanitizer."
40- build_and_test -DMSAN=1 -DUSE_CUSTOM_LIBCXX=1 " ${cflags[@]} "
40+ build_and_test -DMSAN=1 " ${cflags[@]} "
4141fi
4242
4343if [ $( uname -p) == " x86_64" ]; then
4444 # x86 TSAN runs get stuck on PoolTest.Threads for over an hour https://github.com/aws/aws-lc/issues/13
4545 echo " Building AWS-LC in ${build_type} mode with thread sanitizer."
46- run_build -DTSAN=1 -DUSE_CUSTOM_LIBCXX=1 " ${cflags[@]} "
46+ run_build -DTSAN=1 " ${cflags[@]} "
4747else
4848 echo " Testing AWS-LC in ${build_type} mode with thread sanitizer."
49- build_and_test -DTSAN=1 -DUSE_CUSTOM_LIBCXX=1 " ${cflags[@]} "
50- fi
49+ build_and_test -DTSAN=1 " ${cflags[@]} "
50+ fi
You can’t perform that action at this time.
0 commit comments