Skip to content

Fix building on Windows with MSYS2 #192

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
500-internal-server-error wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix building on Windows with MSYS2 #192

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
84fa1ac
Fix building on Windows with Clang in MinGW mode
500-internal-server-error Feb 19, 2025
d7d5e31
Fix building with (mostly) default flags on Windows MinGW
500-internal-server-error Feb 19, 2025
08f6074
Add CI for Windows MinGW builds
500-internal-server-error Feb 19, 2025
a2d86db
Fix CI for Windows MSVC builds
500-internal-server-error Feb 19, 2025
e12be06
Fix CI
500-internal-server-error Feb 19, 2025
6fe45fb
Fix CI for Windows MinGW builds
500-internal-server-error Feb 19, 2025
300d4e0
Fix CI for Windows MinGW builds
500-internal-server-error Feb 19, 2025
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
Next Next commit
Fix building on Windows with Clang in MinGW mode 
Apply GCC `#pragma`s to Clang too, and also more to fix the things Clang
catches that GCC doesn't
  • Loading branch information
@500-internal-server-error
500-internal-server-error committed Feb 19, 2025
commit 84fa1ac50aaa91e259b2b9c12c108e3e00ea0b12
29 changes: 25 additions & 4 deletions include/ghc/filesystem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1941,15 +1941,15 @@ GHC_INLINE void create_symlink(const path& target_name, const path& new_symlink,
ec = detail::make_error_code(detail::portable_error::not_supported);
return;
}
#if defined(__GNUC__) && __GNUC__ >= 8
#if (defined(__GNUC__) && __GNUC__ >= 8) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-function-type"
#elif defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__clang__)
#pragma warning(push)
#pragma warning(disable : 4191)
#endif
static CreateSymbolicLinkW_fp api_call = reinterpret_cast<CreateSymbolicLinkW_fp>(GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "CreateSymbolicLinkW"));
#if defined(__GNUC__) && __GNUC__ >= 8
#if (defined(__GNUC__) && __GNUC__ >= 8) || defined(__clang__)
#pragma GCC diagnostic pop
#elif defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__clang__)
#pragma warning(pop)
Expand All @@ -1970,15 +1970,15 @@ GHC_INLINE void create_symlink(const path& target_name, const path& new_symlink,

GHC_INLINE void create_hardlink(const path& target_name, const path& new_hardlink, std::error_code& ec)
{
#if defined(__GNUC__) && __GNUC__ >= 8
#if (defined(__GNUC__) && __GNUC__ >= 8) || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-function-type"
#elif defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__clang__)
#pragma warning(push)
#pragma warning(disable : 4191)
#endif
static CreateHardLinkW_fp api_call = reinterpret_cast<CreateHardLinkW_fp>(GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "CreateHardLinkW"));
#if defined(__GNUC__) && __GNUC__ >= 8
#if (defined(__GNUC__) && __GNUC__ >= 8) || defined(__clang__)
#pragma GCC diagnostic pop
#elif defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__clang__)
#pragma warning(pop)
Expand Down Expand Up @@ -2116,6 +2116,13 @@ class unique_handle
element_type _handle;
};

// It seems GCC doesn't catch this, but Clang does
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72751
#if defined(__clang__) && defined(__MINGW32__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnested-anon-types"
#endif

#ifndef REPARSE_DATA_BUFFER_HEADER_SIZE
typedef struct _REPARSE_DATA_BUFFER
{
Expand Down Expand Up @@ -2152,6 +2159,10 @@ typedef struct _REPARSE_DATA_BUFFER
#endif
#endif

#if defined(__clang__) && defined(__MINGW32__)
#pragma clang diagnostic pop
#endif

template <class T>
struct free_deleter
{
Expand Down Expand Up @@ -2246,12 +2257,22 @@ GHC_INLINE void timeToFILETIME(time_t t, FILETIME& ft)
ft.dwHighDateTime = ull.HighPart;
}

// Not sure why GCC doesn't catch this here, but Clang does
#if defined(__clang__) && defined(__MINGW32__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-parameter"
#endif

template <typename INFO>
GHC_INLINE uintmax_t hard_links_from_INFO(const INFO* info)
{
return static_cast<uintmax_t>(-1);
}

#if defined(__clang__) && defined(__MINGW32__)
#pragma clang diagnostic pop
#endif

template <>
GHC_INLINE uintmax_t hard_links_from_INFO<BY_HANDLE_FILE_INFORMATION>(const BY_HANDLE_FILE_INFORMATION* info)
{
Expand Down