Skip to content

Commit

Permalink
Added build suffix to musl
Browse files Browse the repository at this point in the history
  • Loading branch information
Sssssaltyfish committed Apr 17, 2024
1 parent 23865a3 commit 363aff4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
15 changes: 10 additions & 5 deletions scripts/make/build_musl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ rust_lib := target/$(TARGET)/$(MODE)/lib$(rust_lib_name).a

musl_version := 1.2.3

build_suffix := _$(ARCH)_$(MODE)
muslibc_dir := ulib/ruxmusl
build_dir := $(muslibc_dir)/build_musl_$(ARCH)
build_dir := $(muslibc_dir)/build_musl$(build_suffix)
install_dir_name := install$(build_suffix)
install_dir := $(muslibc_dir)/$(install_dir_name)

musl_dir := $(muslibc_dir)/musl-$(musl_version)
inc_dir := $(muslibc_dir)/install/include
c_lib := $(muslibc_dir)/install/lib/libc.a
inc_dir := $(install_dir)/include
c_lib := $(install_dir)/lib/libc.a

libgcc :=

CFLAGS += -nostdinc -fno-builtin -ffreestanding -Wall
Expand Down Expand Up @@ -42,14 +47,14 @@ else
endif

build_musl:
ifeq ($(wildcard $(build_dir)),)
ifeq ($(wildcard $(install_dir)),)
ifeq ($(wildcard $(musl_dir)),)
@echo "Download musl-1.2.3 source code"
wget https://musl.libc.org/releases/musl-1.2.3.tar.gz -P $(muslibc_dir)
tar -zxvf $(muslibc_dir)/musl-1.2.3.tar.gz -C $(muslibc_dir) && rm -f $(muslibc_dir)/musl-1.2.3.tar.gz
endif
mkdir -p $(build_dir)
cd $(build_dir) && ../musl-1.2.3/configure --prefix=../install --exec-prefix=../ --syslibdir=../install/lib --disable-shared ARCH=$(RUX_ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) CFLAGS='$(CFLAGS)'
cd $(build_dir) && ../musl-1.2.3/configure --prefix=../$(install_dir_name) --exec-prefix=../ --syslibdir=../$(install_dir_name)/lib --disable-shared ARCH=$(RUX_ARCH) CC=$(CC) CROSS_COMPILE=$(CROSS_COMPILE) CFLAGS='$(CFLAGS)'
cd $(build_dir) && $(MAKE) -j && $(MAKE) install
endif

Expand Down
1 change: 1 addition & 0 deletions ulib/ruxmusl/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build_*
install
install_*
musl-*

0 comments on commit 363aff4

Please sign in to comment.