Skip to content
Snippets Groups Projects
Commit b496b9a2 authored by Michael Aaron Murphy's avatar Michael Aaron Murphy
Browse files

Merge branch 'master' of gitlab.redox-os.org:redox-os/ion into make-map-reassignment-work

parents 76118545 d74cf691
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 2
− 1
View file @ b496b9a2
...@@ -17,12 +17,13 @@ endif ...@@ -17,12 +17,13 @@ endif
ifeq (1,$(REDOX)) ifeq (1,$(REDOX))
undefine ARGSV undefine ARGSV
ARGS += --target x86_64-unknown-redox ARGS += --target x86_64-unknown-redox
PREARGS += +nightly
endif endif
.PHONY: all clean distclean install uninstall .PHONY: all clean distclean install uninstall
all: version extract .cargo/config all: version extract .cargo/config
cargo build $(ARGS) $(ARGSV) cargo $(PREARGS) build $(ARGS) $(ARGSV)
clean: clean:
cargo clean cargo clean
......
rust-toolchain deleted 100644 → 0
+ 0
− 1
View file @ 76118545
1.28.0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment