Merge pull request #6 from csssuf/cargo

Build with cargo instead of xargo

.cargo/config

@@ -1,12 +1,13 @@
 #
-[target.efi-app-x86_64]
+[target.x86_64-unknown-linux-gnu]
 rustflags = [
     "--emit=obj",
     "-C", "relocation-model=pic",
+    "-C", "linker=ld",
+    "-Z", "linker-flavor=ld",
     "-C", "link-arg=-T/usr/lib64/gnuefi/elf_x86_64_efi.lds",
     "-C", "link-arg=-znocombreloc",
     "-C", "link-arg=/usr/lib64/gnuefi/crt0-efi-x86_64.o",
-    "-C", "link-arg=--hash-style=sysv",
     "-C", "link-arg=-Bsymbolic",
     "-C", "link-arg=-pie",
     "-C", "link-arg=-lefi",

Makefile

@@ -2,12 +2,12 @@ LIB_DIR ?= /usr/lib64
 EFI_DIR ?= $(LIB_DIR)/gnuefi
 
 all: TYPE := release
-all: XARGO_FLAG := --release
+all: CARGO_FLAG := --release
 all: build/bootx64-release.efi
 .PHONY: all
 
 debug: TYPE := debug
-debug: XARGO_FLAG :=
+debug: CARGO_FLAG :=
 debug: build/bootx64-debug.efi build/bootx64-debug-symbols.efi
 .PHONY: debug
 
@@ -17,20 +17,20 @@ build/bootx64-%.efi: build/picker-%.so
 build/bootx64-%-symbols.efi: build/picker-%.so
 	objcopy --target=efi-app-x86_64 $< $@
 
-# Because xargo/cargo don't remove old build artifacts from deps/ when
-# building, if source files or dependencies are removed, they will still be
-# linked into the final application unless they are cleaned up with the
-# `clean` target or `xargo clean`.
-build/picker-%.so: target/efi-app-x86_64/%/deps/picker.o
+# Because cargo doesn't remove old build artifacts from deps/ when building, if
+# source files or dependencies are removed, they will still be linked into the
+# final application unless they are cleaned up with the `clean` target or
+# `cargo clean`.
+build/picker-%.so: target/%/deps/picker.o
 	@mkdir -p build
-	ld target/efi-app-x86_64/$(TYPE)/deps/*.o $(EFI_DIR)/crt0-efi-x86_64.o -nostdlib -znocombreloc -T $(EFI_DIR)/elf_x86_64_efi.lds -shared -Bsymbolic -lefi -L $(LIB_DIR) -pie -e efi_entry -o $@
+	ld target/$(TYPE)/deps/*.o $(EFI_DIR)/crt0-efi-x86_64.o -nostdlib -znocombreloc -T $(EFI_DIR)/elf_x86_64_efi.lds -shared -Bsymbolic -lefi -L $(LIB_DIR) -pie -e efi_entry -o $@
 
-target/efi-app-x86_64/%/deps/picker.o: src/picker.rs src/uefi_entry/mod.rs src/util/mod.rs src/util/input.rs Cargo.toml
-	xargo build --target=efi-app-x86_64 $(XARGO_FLAG)
+target/%/deps/picker.o: src/picker.rs src/uefi_entry/mod.rs src/util/mod.rs src/util/input.rs Cargo.toml
+	cargo build $(CARGO_FLAG)
 
 clean:
 	-rm build/*
-	-xargo clean
+	-cargo clean
 .PHONY: clean
 
-.PRECIOUS: target/efi-app-x86_64/%/deps/picker.o
+.PRECIOUS: target/%/deps/picker.o