From 9d0053e629dfa46d37274d1ef8222acb6cb354ed Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 14 Aug 2024 07:41:45 -0700 Subject: [PATCH] Disable tests/benchmarks for libcxx These aren't needed anyway and fix a build issue discovered in #474. Additionally a typo was fixed here too. --- cmake/wasi-sdk-sysroot.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/wasi-sdk-sysroot.cmake b/cmake/wasi-sdk-sysroot.cmake index d0c4287b9..127ca62d3 100644 --- a/cmake/wasi-sdk-sysroot.cmake +++ b/cmake/wasi-sdk-sysroot.cmake @@ -142,7 +142,7 @@ function(define_wasi_libc_sub target target_suffix lto) list(JOIN extra_cflags_list " " extra_cflags) ExternalProject_Add(wasi-libc-${target}${target_suffix}-build - # Currently wasi-libc doesn't support out-of-tree builds so feigh a + # Currently wasi-libc doesn't support out-of-tree builds so feign a # "download command" which copies the source tree to a different location # so out-of-tree builds are supported. DOWNLOAD_COMMAND @@ -262,6 +262,8 @@ function(define_libcxx_sub target target_suffix extra_target_flags extra_libdir_ -DCMAKE_CXX_FLAGS=${extra_cxxflags} -DLIBCXX_LIBDIR_SUFFIX=/${target}${extra_libdir_suffix} -DLIBCXXABI_LIBDIR_SUFFIX=/${target}${extra_libdir_suffix} + -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXX_INCLUDE_BENCHMARKS=OFF # See https://www.scivision.dev/cmake-externalproject-list-arguments/ for # why this is in `CMAKE_CACHE_ARGS` instead of above