Skip to content

Commit

Permalink
refactor(user/app): switch from musl to glibc
Browse files Browse the repository at this point in the history
  • Loading branch information
Chiichen committed Oct 19, 2024
1 parent 25e31a4 commit a756e6d
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions user/apps/clear/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test-backlog/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
export CC=x86_64-linux-musl-gcc
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test-for-robustfutex/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test-mount/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test_alarm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
4 changes: 2 additions & 2 deletions user/apps/test_glibc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test_lo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test_socket/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test_statx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/test_tokio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ else
endif

ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

run:
Expand Down
6 changes: 3 additions & 3 deletions user/apps/user-manage/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ endif


ifeq ($(ARCH), x86_64)
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
else ifeq ($(ARCH), riscv64)
export RUST_TARGET=riscv64gc-unknown-linux-gnu
else
else
# 默认为x86_86,用于本地编译
export RUST_TARGET=x86_64-unknown-linux-musl
export RUST_TARGET=x86_64-unknown-linux-gnu
endif

build:
Expand Down

0 comments on commit a756e6d

Please sign in to comment.