diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.cc | 4 | ||||
| -rw-r--r-- | src/tools.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/configure.cc b/src/configure.cc index d2c1053..da5dbfd 100644 --- a/src/configure.cc +++ b/src/configure.cc @@ -27,7 +27,7 @@ const std::filesystem::path configHeaderFile("config.h"); std::map<std::string, std::string> external_includedir; std::map<std::string, std::string> external_libdir; -#if !defined(_WIN32) +#if !defined(_WIN32) || defined(__MINGW32__) const ctor::configuration& __attribute__((weak)) ctor::get_configuration() #else const ctor::configuration& default_get_configuration() @@ -49,7 +49,7 @@ const ctor::configuration& default_get_configuration() } return cfg; } -#if defined(_WIN32) +#if defined(_WIN32) && !defined(__MINGW32__) // Hack to make ctor::get_configuration "weak" linked // See: // https://stackoverflow.com/questions/2290587/gcc-style-weak-linking-in-visual-studio diff --git a/src/tools.cc b/src/tools.cc index 7f16a0e..4ae5f37 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -418,7 +418,7 @@ std::string get_arch([[maybe_unused]] ctor::output_system system) { std::string arch; // TODO popen on windows -#if !defined(_WIN32) +#if !defined(_WIN32) || defined(__MINGW32__) std::string cmd; const auto& c = ctor::get_configuration(); switch(system) |