From 25fb1427abc188082dcebffd41373e69b42696f5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 16 Oct 2016 13:58:45 -0600 Subject: [PATCH] Fix for new goblin, fix of accidental swap of fusermount -u and sudo umount --- Cargo.toml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 097d7d6..82ebf7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ syscall = { path = "syscall/" } [dependencies.goblin] git = "https://github.com/m4b/goblin.git" default-features = false -features = ["no_mach", "no_mach32", "no_pe", "no_pe32", "no_endian_fd", "pure"] +features = ["elf32", "elf64"] [dev-dependencies] arch_test = { path = "arch/test" } diff --git a/Makefile b/Makefile index 2ce68ae..09202dc 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ else CC=$(ARCH)-elf-gcc CXX=$(ARCH)-elf-g++ ECHO=/bin/echo - FUMOUNT=fusermount -u + FUMOUNT=sudo umount LD=$(ARCH)-elf-ld LDFLAGS=--gc-sections KRUSTCFLAGS+=-C linker=$(CC) @@ -124,7 +124,7 @@ else CC=gcc CXX=g++ ECHO=echo - FUMOUNT=sudo umount + FUMOUNT=fusermount -u LD=ld LDFLAGS=--gc-sections ifneq ($(kvm),no)