use lld linker for cross builds

antondlr · Mar 26, 2024 · 36d5c79 · 36d5c79
1 parent 0ec722e
commit 36d5c79
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -85,19 +85,19 @@ jobs:
                   cargo install cross
                   env CROSS_PROFILE=${{ matrix.profile }} CROSS_FEATURES=${{ matrix.features.env }} make build-${{ matrix.binary }}
 
-            - name: move binary
-              run: |
-                mkdir ./bin; \
-                find ./target -type f -name "lighthouse" -exec mv {} /bin/ \;
-
-#            - name: Make bin dir
-#              run: mkdir ./bin
-#            - name: Move cross-built binary into Docker scope (if ARM)
-#              if: startsWith(matrix.binary, 'aarch64')
-#              run: mv ./target/aarch64-unknown-linux-gnu/${{ matrix.profile }}/lighthouse ./bin
-#            - name: Move cross-built binary into Docker scope (if x86_64)
-#              if: startsWith(matrix.binary, 'x86_64')
-#              run: mv ./target/x86_64-unknown-linux-gnu/${{ matrix.profile }}/lighthouse ./bin
+#            - name: move binary
+#              run: |
+#                mkdir ./bin; \
+#                find ./target -type f -name "lighthouse" -exec mv {} /bin/ \;
+
+            - name: Make bin dir
+              run: mkdir ./bin
+            - name: Move cross-built binary into Docker scope (if ARM)
+              if: startsWith(matrix.binary, 'aarch64')
+              run: mv ./target/aarch64-unknown-linux-gnu/${{ matrix.profile }}/lighthouse ./bin
+            - name: Move cross-built binary into Docker scope (if x86_64)
+              if: startsWith(matrix.binary, 'x86_64')
+              run: mv ./target/x86_64-unknown-linux-gnu/${{ matrix.profile }}/lighthouse ./bin
 
             - name: Map aarch64 to arm64 short arch
               if: startsWith(matrix.binary, 'aarch64')

diff --git a/Cross.toml b/Cross.toml
@@ -1,5 +1,7 @@
 [target.x86_64-unknown-linux-gnu]
-pre-build = ["apt-get install -y cmake clang-5.0"]
+pre-build = ["apt-get install -y cmake clang-5.0 lld"]
+rustflags = ["-C", "link-arg=-fuse-ld=lld"]
 
 [target.aarch64-unknown-linux-gnu]
-pre-build = ["apt-get install -y cmake clang-5.0"]
+pre-build = ["apt-get install -y cmake clang-5.0 lld"]
+rustflags = ["-C", "link-arg=-fuse-ld=lld"]