Fix for new goblin, fix of accidental swap of fusermount -u and sudo umount
This commit is contained in:
parent
a37103fe47
commit
25fb1427ab
|
@ -15,7 +15,7 @@ syscall = { path = "syscall/" }
|
||||||
[dependencies.goblin]
|
[dependencies.goblin]
|
||||||
git = "https://github.com/m4b/goblin.git"
|
git = "https://github.com/m4b/goblin.git"
|
||||||
default-features = false
|
default-features = false
|
||||||
features = ["no_mach", "no_mach32", "no_pe", "no_pe32", "no_endian_fd", "pure"]
|
features = ["elf32", "elf64"]
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
arch_test = { path = "arch/test" }
|
arch_test = { path = "arch/test" }
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -113,7 +113,7 @@ else
|
||||||
CC=$(ARCH)-elf-gcc
|
CC=$(ARCH)-elf-gcc
|
||||||
CXX=$(ARCH)-elf-g++
|
CXX=$(ARCH)-elf-g++
|
||||||
ECHO=/bin/echo
|
ECHO=/bin/echo
|
||||||
FUMOUNT=fusermount -u
|
FUMOUNT=sudo umount
|
||||||
LD=$(ARCH)-elf-ld
|
LD=$(ARCH)-elf-ld
|
||||||
LDFLAGS=--gc-sections
|
LDFLAGS=--gc-sections
|
||||||
KRUSTCFLAGS+=-C linker=$(CC)
|
KRUSTCFLAGS+=-C linker=$(CC)
|
||||||
|
@ -124,7 +124,7 @@ else
|
||||||
CC=gcc
|
CC=gcc
|
||||||
CXX=g++
|
CXX=g++
|
||||||
ECHO=echo
|
ECHO=echo
|
||||||
FUMOUNT=sudo umount
|
FUMOUNT=fusermount -u
|
||||||
LD=ld
|
LD=ld
|
||||||
LDFLAGS=--gc-sections
|
LDFLAGS=--gc-sections
|
||||||
ifneq ($(kvm),no)
|
ifneq ($(kvm),no)
|
||||||
|
|
Loading…
Reference in a new issue