-
-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #324 from isuruf/mingw
support mingw on windows
- Loading branch information
Showing
2 changed files
with
42 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
From b9574b59ea44cfb30ff50633b3b346faba39b39b Mon Sep 17 00:00:00 2001 | ||
From: Isuru Fernando <isuruf@gmail.com> | ||
Date: Fri, 18 Oct 2024 10:28:09 -0400 | ||
Subject: [PATCH 10/10] Add conda mingw paths | ||
|
||
--- | ||
clang/lib/Driver/ToolChains/MinGW.cpp | 8 ++++++++ | ||
1 file changed, 8 insertions(+) | ||
|
||
diff --git a/clang/lib/Driver/ToolChains/MinGW.cpp b/clang/lib/Driver/ToolChains/MinGW.cpp | ||
index c81a7ed17029..4f47e01fda58 100644 | ||
--- a/clang/lib/Driver/ToolChains/MinGW.cpp | ||
+++ b/clang/lib/Driver/ToolChains/MinGW.cpp | ||
@@ -532,6 +532,10 @@ toolchains::MinGW::MinGW(const Driver &D, const llvm::Triple &Triple, | ||
getFilePaths().push_back( | ||
(Base + SubdirName + llvm::sys::path::get_separator() + "mingw/lib").str()); | ||
|
||
+ // Conda | ||
+ getFilePaths().push_back( | ||
+ (Base + SubdirName + llvm::sys::path::get_separator() + "sysroot/usr/lib").str()); | ||
+ | ||
// Only include <base>/lib if we're not cross compiling (not even for | ||
// windows->windows to a different arch), or if the sysroot has been set | ||
// (where we presume the user has pointed it at an arch specific | ||
@@ -698,6 +702,10 @@ void toolchains::MinGW::AddClangSystemIncludeArgs(const ArgList &DriverArgs, | ||
addSystemInclude(DriverArgs, CC1Args, | ||
Base + SubdirName + llvm::sys::path::get_separator() + "usr/include"); | ||
|
||
+ // Conda | ||
+ addSystemInclude(DriverArgs, CC1Args, | ||
+ Base + SubdirName + llvm::sys::path::get_separator() + "sysroot/usr/include"); | ||
+ | ||
// Only include <base>/include if we're not cross compiling (but do allow it | ||
// if we're on Windows and building for Windows on another architecture), | ||
// or if the sysroot has been set (where we presume the user has pointed it | ||
-- | ||
2.44.0 | ||
|