Skip to content

[libcxx] Fix freestanding build with filesystem disabled on Windows #164602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −5
Open

[libcxx] Fix freestanding build with filesystem disabled on Windows #164602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libcxx/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ set(LIBCXX_SOURCES
error_category.cpp
exception.cpp
expected.cpp
filesystem/filesystem_clock.cpp
filesystem/filesystem_error.cpp
filesystem/path_parser.h
filesystem/path.cpp
functional.cpp
hash.cpp
include/apple_availability.h
Expand Down Expand Up @@ -117,6 +114,9 @@ endif()

if (LIBCXX_ENABLE_FILESYSTEM)
list(APPEND LIBCXX_SOURCES
filesystem/filesystem_clock.cpp
filesystem/filesystem_error.cpp
filesystem/path.cpp
filesystem/directory_entry.cpp
filesystem/directory_iterator.cpp
filesystem/file_descriptor.h
Expand Down
6 changes: 4 additions & 2 deletions libcxx/src/print.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

#include <__system_error/system_error.h>

#include "filesystem/error.h"

#if defined(_LIBCPP_WIN32API)
# define WIN32_LEAN_AND_MEAN
# define NOMINMAX
Expand Down Expand Up @@ -51,7 +49,11 @@ __write_to_windows_console([[maybe_unused]] FILE* __stream, [[maybe_unused]] wst
__view.size(),
nullptr,
nullptr) == 0) {
# if _LIBCPP_HAS_FILESYSTEM
std::__throw_system_error(filesystem::detail::get_last_error(), "failed to write formatted output");
# else
std::__throw_system_error(error_code(GetLastError(), system_category()), "failed to write formatted output");
# endif
}
}
# endif // _LIBCPP_HAS_WIDE_CHARACTERS
Expand Down
Loading