From 25930773617ddf40c9fefd59b750929b4dd3b26b Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 13 Feb 2025 01:14:38 +0100 Subject: [PATCH] CI: only use headers from bundled libc++ on FreeBSD Linking different versions of libc++ can cause ABI issues but new C++ features are usually limited to headers. ld: error: undefined symbol: operator new(unsigned long, std::align_val_t) >>> referenced by string.cpp >>> string.cpp.o:(void* std::__1::__libcpp_operator_new[abi:ne190107](unsigned long, std::align_val_t)) in archive /tmp/cirrus-ci-build/libcxx_prefix/lib/libc++.a >>> referenced by memory_string_searcher.cpp >>> memory_string_searcher.cpp.o:(memory_viewer_panel::OnSearch(std::__1::basic_string, std::__1::allocator>, unsigned int)) in archive rpcs3/rpcs3qt/librpcs3_ui.a >>> referenced by game_list_frame.cpp >>> game_list_frame.cpp.o:(stx::auto_typemap::auto_typemap()) in archive rpcs3/rpcs3qt/librpcs3_ui.a >>> referenced 23 more times --- .ci/build-freebsd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index d98aac9dd6..1b3928a0eb 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -19,7 +19,7 @@ cmake -B libcxx_build -G Ninja -S llvm*/libcxx \ cmake --build libcxx_build cmake --install libcxx_build export CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem$PWD/libcxx_prefix/include/c++/v1" -export LDFLAGS="$LDFLAGS -nostdlib++ -L$PWD/libcxx_prefix/lib -l:libc++.a -lcxxrt" +#export LDFLAGS="$LDFLAGS -nostdlib++ -L$PWD/libcxx_prefix/lib -l:libc++.a -lcxxrt" CONFIGURE_ARGS=" -DWITH_LLVM=ON