From 31e2618e08bea4ac303ff3df31a9dbf6e526408d Mon Sep 17 00:00:00 2001 From: Zhou Kang Date: Wed, 14 Jun 2023 02:39:31 +0000 Subject: [PATCH] fix make error --- .gitignore | 1 + Makefile | 21 +++------------------ src/elf_read_elf_xz.c | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 973aad3..2a5256c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build +target /pkg/ *.log *.pyc diff --git a/Makefile b/Makefile index a3ce5c2..6c9c72f 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ sysboostd: clear cargo build +sysboost: + ninja -C build -v + release: rm -rf build meson build @@ -18,24 +21,15 @@ release: debug: rm -rf build meson build --buildtype=debug - make -C sysboost - -sysboost: - ninja -C build -v clean: ninja -C build clean - make -C sysboost clean cargo clean format: meson --internal clangformat ./ ./build cargo fmt -static_template_debug: - readelf -W -a ./build/sysboost/src/static_template/static_template > static_template.elf - objdump -d ./build/sysboost/src/static_template/static_template > static_template.asm - test: sysboostd clear cp -f $(SYSBOOSTD) $(SYSBOOSTD_INSTALL_PATH) @@ -44,12 +38,3 @@ test: sysboostd test-debug: cargo test -- --nocapture - -bash-test: static_template_debug - clear - ./build/sysboost/sysboost -static ./build/sysboost/src/static_template/sysboost_static_template bash/bash bash/libtinfo.so - readelf -W -a bash.rto > bash.rto.elf - objdump -d bash.rto > bash.rto.asm - -bash-gdb: - gdb --args ./build/sysboost/sysboost -static ./build/sysboost/src/static_template/static_template bash/bash bash/libtinfo.so \ No newline at end of file diff --git a/src/elf_read_elf_xz.c b/src/elf_read_elf_xz.c index e3caa56..be8c0d8 100644 --- a/src/elf_read_elf_xz.c +++ b/src/elf_read_elf_xz.c @@ -114,7 +114,7 @@ void elf_unload_xz(elf_file_t *ef) free(ef->hdr); } -static const char magic_xz[] = {0xfd, '7', 'z', 'X', 'Z', 0}; +static const unsigned char magic_xz[] = {0xfd, '7', 'z', 'X', 'Z', 0}; bool elf_is_xz_file(elf_file_t *ef) { -- Gitee