Skip to content

Commit

Permalink
fix make, libc-test
Browse files Browse the repository at this point in the history
  • Loading branch information
function2-llx committed May 7, 2020
1 parent e713374 commit f395c36
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,12 @@ ifeq ($(arch), $(filter $(arch), x86_64 aarch64))
@cd $(out_dir) && tar xf ../../$(alpine)
endif

$(libc-test):
ifeq ($(arch), $(filter $(arch), x86_64))
cd libc-test && pwd
pwd
endif

$(musl-gcc):
ifeq ($(arch), $(filter $(arch), x86_64))
cd musl-gcc && make all arch=$(arch)
endif

libc-test: $(libc-test)
libc-test:
ifeq ($(arch), $(filter $(arch), x86_64))
@echo Building libc-test
@mkdir -p $(out_dir)/libc-test
Expand Down
8 changes: 4 additions & 4 deletions make/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
make_version := 3.78.1
make_version := 3.82
arch ?= x86_64
make_tarball := make-$(make_version).tar.gz
make_tarball_path := src/$(make_tarball)
Expand All @@ -13,15 +13,15 @@ $(make_tarball_path):
@mkdir -p src
wget http://ftp.gnu.org/gnu/make/make-$(make_version).tar.gz -O $(make_tarball_path)

prefix = $(shell readlink -f ../build/$(arch)/usr)
prefix = $(shell readlink -f ../build/$(arch)/)

$(make_dir): $(make_tarball_path)
@mkdir -p $(build_dir)
@cd $(build_dir) && tar xvf ../../$(make_tarball_path)
@cd $(build_dir) && tar xf ../../$(make_tarball_path)
chmod +w $(make_dir)/README

make: $(make_dir)
@cp -r $(make_dir) ../build/$(arch)/
cd $(make_dir) && CC=$(arch)-linux-musl-gcc ./configure --prefix=$(prefix) && make -j && make install

all: make

Expand Down

0 comments on commit f395c36

Please sign in to comment.