Skip to content

Commit 500ef8a

Browse files
committed
try fix build
1 parent 49c2268 commit 500ef8a

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/build.yml

-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ jobs:
4343
cross build --release --target ${{ matrix.target }} --target-dir target/${{ matrix.platform }}
4444
- name: Build - aarch64
4545
if: ${{ matrix.cross == 'aarch64' }}
46-
env:
47-
CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
48-
CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
4946
run: |
5047
sudo apt-get update
5148
sudo apt-get install -y gcc-aarch64-linux-gnu libc6-dev-arm64-cross g++-aarch64-linux-gnu

Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,3 @@ glob = "0.3.0"
2121
[[bin]]
2222
name = "lua-language-server"
2323
path = "src/main.rs"
24-
25-
[target.aarch64-unknown-linux-gnu]
26-
linker = "aarch64-linux-gnu-gcc"

build.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
fn main() {
22
std::env::set_var("CC_LOG", "1");
3+
if cfg!(target_arch = "aarch64") {
4+
std::env::set_var("CC", "aarch64-linux-gnu-gcc");
5+
std::env::set_var("CXX", "aarch64-linux-gnu-g++");
6+
}
37

48
build_lua();
59
build_lua_seri();
@@ -113,8 +117,7 @@ fn build_emmyluacodestyle() {
113117
if cfg!(windows) {
114118
builder.flag("/utf-8");
115119
builder.flag("/std:c++17");
116-
}
117-
else {
120+
} else {
118121
builder.flag("-std=c++17");
119122
}
120123

0 commit comments

Comments
 (0)