Use patched Solana LLVM to fix cross-target build

joncinque · Dec 15, 2023 · ec66923 · ec66923
1 parent 45111c3
commit ec66923
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "llvm-project"]
 	path = llvm-project
-	url = https://github.com/solana-labs/llvm-project
+	url = https://github.com/joncinque/llvm-project-solana
diff --git a/README.md b/README.md
@@ -19,20 +19,6 @@ Build everything for the host machine using `./build`, ie:
 
 ## Known issues
 
-### (no targets are registered)
-
-The final step of cross-compiling zig with zig currently fails due to a linking
-error:
-
-```
-error: ld.lld: Unable to find target for this triple (no targets are registered)
-```
-
-Since most people will likely only need the compiler working on their host system,
-the repo is still useful in its current state.
-
-You can use the zig compiler at `./out/host/bin/zig` to build Solana programs.
-
 ### -Bsymbolic-functions not supported
 
 When building the LLVM fork of Solana, you may get an error building clang:

diff --git a/llvm-project b/llvm-project
+1 −1		clang/CMakeLists.txt
+3 −3		clang/tools/CMakeLists.txt
+3 −3		clang/tools/clang-shlib/CMakeLists.txt
+4 −1		lld/CMakeLists.txt
+8 −1		lld/COFF/Driver.cpp
+12 −0		lld/ELF/Driver.cpp
+0 −14		lld/tools/lld/lld.cpp
+12 −0		lld/wasm/Driver.cpp